diff --git a/.travis/deploy_script.sh b/.travis/deploy_script.sh
index bdeec99b..8da3714f 100755
--- a/.travis/deploy_script.sh
+++ b/.travis/deploy_script.sh
@@ -90,6 +90,8 @@ if [ "$TRAVIS" = "true" ]; then
     find storage/framework/views -mindepth 1 -not -name '.gitignore' -print0 -exec rm -rf {} +
     find storage/logs -mindepth 1 -not -name '.gitignore' -print0 -exec rm -rf {} +
 
+    # Regenerate the autoloader and classes
+    composer dump-autoload
     make clean
 
     echo "Creating Tarball"
diff --git a/composer.json b/composer.json
index 712e86fb..055c9a76 100755
--- a/composer.json
+++ b/composer.json
@@ -68,8 +68,7 @@
         ],
         "psr-4": {
             "App\\": "app/",
-            "Modules\\": "modules/",
-            "Tests\\": "tests/"
+            "Modules\\": "modules/"
         }
     },
     "autoload-dev": {