diff --git a/composer.json b/composer.json
index 69dcc915a..848440312 100644
--- a/composer.json
+++ b/composer.json
@@ -27,16 +27,20 @@
     },
     "autoload": {
         "classmap": [
-            "app/models",
             "app/database/migrations",
             "app/database/seeds",
-            "app/tests/TestCase.php",
-            "app/filters"
+            "app/filters",
+            "app/models"
         ],
         "psr-4": {
             "CachetHQ\\Cachet\\": "src/"
         }
     },
+    "autoload-dev": {
+        "classmap": [
+            "app/tests/TestCase.php",
+        ]
+    },
     "extra": {
         "paas": {
             "document-root": "public",