diff --git a/composer.json b/composer.json
index 157d79d..5f8c13a 100644
--- a/composer.json
+++ b/composer.json
@@ -35,7 +35,13 @@
         "symfony/monolog-bundle": "^3.2"
     },
     "autoload": {
-        "psr-4": { "Ekino\\NewRelicBundle\\": "" }
+        "psr-4": { "Ekino\\NewRelicBundle\\": "" },
+        "exclude-from-classmap": [
+            "/Tests/"
+        ]
+    },
+    "autoload-dev": {
+        "psr-4": { "Ekino\\NewRelicBundle\\Tests\\": "Tests/" }
     },
     "extra": {
         "branch-alias": {