diff --git a/composer.json b/composer.json
index c4f51eba7b..b6555e1a5a 100644
--- a/composer.json
+++ b/composer.json
@@ -87,7 +87,8 @@
     },
     "autoload-dev": {
         "psr-4": {
-            "tests\\": "tests/",
+            "tests\\unit\\Espo\\": "tests/unit/Espo",
+            "tests\\integration\\Espo\\": "tests/integration/Espo",
             "EspoDev\\": "dev/"
         }
     },