diff --git a/composer.json b/composer.json
index ae32d90d14..108ea8473d 100644
--- a/composer.json
+++ b/composer.json
@@ -73,7 +73,6 @@
 	"autoload": {
 		"psr-4": {
 			"Friendica\\": "src/",
-			"Friendica\\Test\\": "tests/",
 			"Friendica\\Addon\\": "addon/"
 		},
 		"psr-0": {
@@ -87,6 +86,11 @@
 			"boot.php"
 		]
 	},
+	"autoload-dev": {
+		"psr-4": {
+			"Friendica\\Test\\": "tests/"
+		}
+	},
 	"config": {
 		"autoloader-suffix": "Friendica",
 		"optimize-autoloader": true,