diff --git a/phpunit.xml b/phpunit.xml
index d1a9350..0f84fe4 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -20,5 +20,9 @@
             <file>test/app1/src/ClassmapTest.php</file>
             <directory>test/unit/Classmap</directory>
         </testsuite>
+        <testsuite name="files">
+            <file>test/app1/src/FilesTest.php</file>
+            <directory>test/unit/Files</directory>
+        </testsuite>
     </testsuites>
 </phpunit>
\ No newline at end of file
diff --git a/test/app1/composer.json b/test/app1/composer.json
index 605bb58..16e0569 100644
--- a/test/app1/composer.json
+++ b/test/app1/composer.json
@@ -18,6 +18,7 @@
       "TestApp1\\": "src/",
       "TestApp1\\Multi\\": [ "multi/Jik/", "multi/Jiu/" ]
     },
-    "classmap": ["classmap/woc/", "classmap/wop/", "classmap/woj/" ]
+    "classmap": ["classmap/woc/", "classmap/wop/", "classmap/woj/" ],
+    "files": ["files/files1.php", "files/files2.php", "files/more_files/Boom.php" ]
   }
 }
diff --git a/test/app1/files/RedHerring.php b/test/app1/files/RedHerring.php
new file mode 100644
index 0000000..66a62c1
--- /dev/null
+++ b/test/app1/files/RedHerring.php
@@ -0,0 +1,3 @@
+<?php
+
+namespace TestApp1\FilesClasses;
diff --git a/test/app1/files/files1.php b/test/app1/files/files1.php
new file mode 100644
index 0000000..62d7c92
--- /dev/null
+++ b/test/app1/files/files1.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace TestApp1\FilesClasses;
+
+class Bam {};
+class Wam {};
+class Fam {};
\ No newline at end of file
diff --git a/test/app1/files/files2.php b/test/app1/files/files2.php
new file mode 100644
index 0000000..b1cb8d6
--- /dev/null
+++ b/test/app1/files/files2.php
@@ -0,0 +1,10 @@
+<?php
+
+// This is intentionally made global. There are intentionally classes here in and out of a namespace.
+// PHPStorm is subborn in it's complaining about this - so I just turn off inspections for this file.
+class my_global_class_name {}
+
+namespace TestApp1\FilesClasses;
+
+class Cam {}
+class Lam {}
diff --git a/test/app1/files/more_files/Boom.php b/test/app1/files/more_files/Boom.php
new file mode 100644
index 0000000..3b1aad1
--- /dev/null
+++ b/test/app1/files/more_files/Boom.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace MoreFiles;
+
+class Boom {}
+class Zoom {}
+class Loom {}
\ No newline at end of file
diff --git a/test/app1/src/FilesTest.php b/test/app1/src/FilesTest.php
new file mode 100644
index 0000000..a72cffb
--- /dev/null
+++ b/test/app1/src/FilesTest.php
@@ -0,0 +1,47 @@
+<?php
+
+namespace TestApp1;
+
+require_once __DIR__ . '/../vendor/autoload.php';
+
+use HaydenPierce\ClassFinder\ClassFinder;
+
+class FilesTest extends \PHPUnit_Framework_TestCase
+{
+    public function setup()
+    {
+        // Reset ClassFinder back to normal.
+        ClassFinder::setAppRoot(null);
+    }
+    /**
+     * @dataProvider classFinderDataProvider
+     */
+    public function testClassFinder($namespace, $expected, $message)
+    {
+        try {
+            $classes = ClassFinder::getClassesInNamespace($namespace);
+        } catch (\Exception $e) {
+            $this->assertFalse(true, 'An exception occurred: ' . $e->getMessage());
+            $classes = array();
+        }
+
+        $this->assertEquals($expected, $classes, $message);
+    }
+
+    public function classFinderDataProvider()
+    {
+        return array(
+            array(
+                'TestApp1\FilesClasses',
+                array(
+                    'TestApp1\FilesClasses\Bam',
+                    'TestApp1\FilesClasses\Wam',
+                    'TestApp1\FilesClasses\Fam',
+                    'TestApp1\FilesClasses\Cam',
+                    'TestApp1\FilesClasses\Lam',
+                ),
+                'ClassFinder should be able to find 1st party classes included from `files` listed in composer.json.'
+            )
+        );
+    }
+}
\ No newline at end of file