diff --git a/composer.json b/composer.json
index ac92898..0c220f2 100644
--- a/composer.json
+++ b/composer.json
@@ -23,20 +23,10 @@
         "phpunit/phpunit": "~3.7|~4.0|^5.0"
     },
     "autoload": {
-        "classmap": [
-            "WhiteOctoberPagerfantaBundle.php"
-        ],
         "psr-4": {
-            "WhiteOctober\\PagerfantaBundle\\DependencyInjection\\": "DependencyInjection",
-            "WhiteOctober\\PagerfantaBundle\\EventListener\\": "EventListener",
-            "WhiteOctober\\PagerfantaBundle\\Twig\\": "Twig",
-            "WhiteOctober\\PagerfantaBundle\\View\\": "View"
-        }
-    },
-    "autoload-dev": {
-        "psr-4": {
-            "WhiteOctober\\PagerfantaBundle\\Tests\\": "Tests/"
-        }
+            "WhiteOctober\\PagerfantaBundle\\": ""
+        },
+        "exclude-from-classmap": ["Tests/", "TestsProject/"]
     },
     "extra": {
         "branch-alias": {