diff --git a/composer.json b/composer.json
index c07a508f521f..648e3a717af4 100644
--- a/composer.json
+++ b/composer.json
@@ -387,7 +387,10 @@
         "exclude-from-classmap": [
             "**/dev/**",
             "**/update/**",
-            "*/*/Test/**/*Test"
+            "**/Test/Fixture/**",
+            "**/Test/Integration/**",
+            "**/Test/Mftf/**",
+            "**/Test/Unit/**"
         ]
     },
     "autoload-dev": {