diff --git a/README.md b/README.md
index 9855354..84a084a 100644
--- a/README.md
+++ b/README.md
@@ -23,7 +23,7 @@ Mingulay follows [Semantic Versioning](https://semver.org/) practices. Until rel
 Mingulay requires an object that implements the `Mingulay\SeekerInterface` interface. A `LocalFileSeeker` implementation is provided for working with Zip files on disk.
 
 ```php
-$seeker = new \Mingulay\Seeker\LocalFileSeeker("src/Test/fixtures/single-file.zip");
+$seeker = new \Mingulay\Seeker\LocalFileSeeker("test/fixtures/single-file.zip");
 $zip_info = new \Mingulay\ZipRangeReader($seeker);
 var_dump($zip_info->files);
 ```
diff --git a/composer.json b/composer.json
index 68c2fde..ece21d8 100644
--- a/composer.json
+++ b/composer.json
@@ -23,5 +23,10 @@
     "psr-4": {
       "Mingulay\\": "src/"
     }
+  },
+  "autoload-dev": {
+    "psr-4": {
+      "Mingulay\\Test\\": "test/"
+    }
   }
 }
diff --git a/phpunit.xml b/phpunit.xml
index 92fa77a..1d0c5ef 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -2,7 +2,7 @@
 <phpunit colors="true" bootstrap="vendor/autoload.php">
     <testsuites>
         <testsuite name="Mingulay Test Suite">
-            <directory>./src/Test/</directory>
+            <directory>./test/</directory>
         </testsuite>
     </testsuites>
 </phpunit>
\ No newline at end of file
diff --git a/src/Test/LocalSeekerTest.php b/test/LocalSeekerTest.php
similarity index 97%
rename from src/Test/LocalSeekerTest.php
rename to test/LocalSeekerTest.php
index 056441e..c2b1588 100644
--- a/src/Test/LocalSeekerTest.php
+++ b/test/LocalSeekerTest.php
@@ -12,7 +12,7 @@
 class LocalSeekerTest extends TestCase
 {
 
-    const FIXTURE_PATH = "src/Test/fixtures/";
+    const FIXTURE_PATH = "test/fixtures/";
 
     /**
      * Test retrieval from the start of the file.
diff --git a/src/Test/ZipRangeReaderTest.php b/test/ZipRangeReaderTest.php
similarity index 98%
rename from src/Test/ZipRangeReaderTest.php
rename to test/ZipRangeReaderTest.php
index 7cb4fb3..a3a08d8 100644
--- a/src/Test/ZipRangeReaderTest.php
+++ b/test/ZipRangeReaderTest.php
@@ -13,7 +13,7 @@
 class ZipRangeReaderTest extends TestCase
 {
 
-    const FIXTURE_PATH = "src/Test/fixtures/";
+    const FIXTURE_PATH = "test/fixtures/";
 
     /**
      * Test the construction flow with a valid Zip containing a single file.
diff --git a/src/Test/fixtures/invalid-cdr.zip b/test/fixtures/invalid-cdr.zip
similarity index 100%
rename from src/Test/fixtures/invalid-cdr.zip
rename to test/fixtures/invalid-cdr.zip
diff --git a/src/Test/fixtures/invalid-eocd.zip b/test/fixtures/invalid-eocd.zip
similarity index 100%
rename from src/Test/fixtures/invalid-eocd.zip
rename to test/fixtures/invalid-eocd.zip
diff --git a/src/Test/fixtures/invalid-file.zip b/test/fixtures/invalid-file.zip
similarity index 100%
rename from src/Test/fixtures/invalid-file.zip
rename to test/fixtures/invalid-file.zip
diff --git a/src/Test/fixtures/multiple-files-with-comment.zip b/test/fixtures/multiple-files-with-comment.zip
similarity index 100%
rename from src/Test/fixtures/multiple-files-with-comment.zip
rename to test/fixtures/multiple-files-with-comment.zip
diff --git a/src/Test/fixtures/multiple-files.zip b/test/fixtures/multiple-files.zip
similarity index 100%
rename from src/Test/fixtures/multiple-files.zip
rename to test/fixtures/multiple-files.zip
diff --git a/src/Test/fixtures/single-file-with-comment.zip b/test/fixtures/single-file-with-comment.zip
similarity index 100%
rename from src/Test/fixtures/single-file-with-comment.zip
rename to test/fixtures/single-file-with-comment.zip
diff --git a/src/Test/fixtures/single-file-with-file-comment.zip b/test/fixtures/single-file-with-file-comment.zip
similarity index 100%
rename from src/Test/fixtures/single-file-with-file-comment.zip
rename to test/fixtures/single-file-with-file-comment.zip
diff --git a/src/Test/fixtures/single-file.zip b/test/fixtures/single-file.zip
similarity index 100%
rename from src/Test/fixtures/single-file.zip
rename to test/fixtures/single-file.zip