diff --git a/composer.json b/composer.json
index ecd76a31..2921fe7d 100644
--- a/composer.json
+++ b/composer.json
@@ -53,11 +53,16 @@
     },
     "autoload": {
         "psr-4": {
-            "Engelsystem\\": "src/",
-            "Engelsystem\\Migrations\\": "db/migrations"
+            "Engelsystem\\": "src/"
         },
+        "classmap": ["db/migrations"],
         "files": [
             "src/helpers.php"
         ]
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "Engelsystem\\Test\\": "tests/"
+        }
     }
 }
diff --git a/tests/autoload.php b/tests/autoload.php
index 62589e16..ba79bad9 100644
--- a/tests/autoload.php
+++ b/tests/autoload.php
@@ -1,8 +1,3 @@
 <?php
 
-use Composer\Autoload\ClassLoader;
-
 require_once __DIR__ . '/../includes/autoload.php';
-
-/** @var ClassLoader $loader */
-$loader->addPsr4('Engelsystem\\Test\\', __DIR__ . '/');