diff --git a/composer.json b/composer.json
index 83470fed9f648b7cbe57ab5e3540009c342c9c1c..17ffc609062148d797a50a28701f89c88c044259 100644
--- a/composer.json
+++ b/composer.json
@@ -27,7 +27,13 @@
     },
     "autoload-dev": {
         "psr-4": {
-            "SimpleSAML\\Test\\": ["tests", "tests/lib/SimpleSAML"]
+            "SimpleSAML\\Test\\": ["tests", "tests/lib/SimpleSAML"],
+            "SimpleSAML\\Test\\Module\\admin\\": ["tests/lib/SimpleSAML/modules/admin/lib"],
+            "SimpleSAML\\Test\\Module\\core\\": ["tests/lib/SimpleSAML/modules/core/lib"],
+            "SimpleSAML\\Test\\Module\\cron\\": ["tests/lib/SimpleSAML/modules/cron/lib"],
+            "SimpleSAML\\Test\\Module\\exampleauth\\": ["tests/lib/SimpleSAML/modules/exampleauth/lib"],
+            "SimpleSAML\\Test\\Module\\multiauth\\": ["tests/lib/SimpleSAML/modules/multiauth/lib"],
+            "SimpleSAML\\Test\\Module\\saml\\": ["tests/lib/SimpleSAML/modules/saml/lib"]
         },
         "files": ["tests/_autoload_modules.php"]
     },