diff --git a/tests/src/BaseObjectTest.php b/tests/src/BaseObjectTest.php
index 334150391..749ae77c2 100644
--- a/tests/src/BaseObjectTest.php
+++ b/tests/src/BaseObjectTest.php
@@ -3,7 +3,7 @@
  * BaseObjectTest class.
  */
 
-namespace Friendica\Test;
+namespace Friendica\Test\src;
 
 use Friendica\BaseObject;
 use Friendica\Test\Util\AppMockTrait;
diff --git a/tests/src/Core/Config/Cache/ConfigCacheLoaderTest.php b/tests/src/Core/Config/Cache/ConfigCacheLoaderTest.php
index 100c4ab65..d473aec00 100644
--- a/tests/src/Core/Config/Cache/ConfigCacheLoaderTest.php
+++ b/tests/src/Core/Config/Cache/ConfigCacheLoaderTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Friendica\Test\Core\Config\Cache;
+namespace Friendica\Test\src\Core\Config\Cache;
 
 use Friendica\Core\Config\Cache\ConfigCache;
 use Friendica\Core\Config\Cache\ConfigCacheLoader;
diff --git a/tests/src/Core/Config/Cache/ConfigCacheTest.php b/tests/src/Core/Config/Cache/ConfigCacheTest.php
index 582007ed8..1ee2a3f80 100644
--- a/tests/src/Core/Config/Cache/ConfigCacheTest.php
+++ b/tests/src/Core/Config/Cache/ConfigCacheTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Friendica\Test\Core\Config\Cache;
+namespace Friendica\Test\src\Core\Config\Cache;
 
 use Friendica\Core\Config\Cache\ConfigCache;
 use Friendica\Test\MockedTest;
diff --git a/tests/src/Core/Config/ConfigurationTest.php b/tests/src/Core/Config/ConfigurationTest.php
index d06b2beb3..b07f9e630 100644
--- a/tests/src/Core/Config/ConfigurationTest.php
+++ b/tests/src/Core/Config/ConfigurationTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Friendica\Test\Core\Config;
+namespace Friendica\Test\src\Core\Config;
 
 use Friendica\Core\Config\Adapter\IConfigAdapter;
 use Friendica\Core\Config\Cache\ConfigCache;
diff --git a/tests/src/Core/Config/PConfigurationTest.php b/tests/src/Core/Config/PConfigurationTest.php
index 68443d05b..294a73bba 100644
--- a/tests/src/Core/Config/PConfigurationTest.php
+++ b/tests/src/Core/Config/PConfigurationTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Friendica\Test\Core\Config;
+namespace Friendica\Test\src\Core\Config;
 
 use Friendica\Core\Config\Adapter\IPConfigAdapter;
 use Friendica\Core\Config\Cache\ConfigCache;
diff --git a/tests/src/Database/DBATest.php b/tests/src/Database/DBATest.php
index 8e102ec63..511821da5 100644
--- a/tests/src/Database/DBATest.php
+++ b/tests/src/Database/DBATest.php
@@ -1,5 +1,5 @@
 <?php
-namespace Friendica\Test\Database;
+namespace Friendica\Test\src\Database;
 
 use Friendica\App;
 use Friendica\Core\Config;
diff --git a/tests/src/Database/DBStructureTest.php b/tests/src/Database/DBStructureTest.php
index 454d6e8a4..7b1ff2a31 100644
--- a/tests/src/Database/DBStructureTest.php
+++ b/tests/src/Database/DBStructureTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Friendica\Test\Database;
+namespace Friendica\Test\src\Database;
 
 use Friendica\App;
 use Friendica\Core\Config\Cache;
diff --git a/tests/src/Model/UserTest.php b/tests/src/Model/UserTest.php
index 3e224fb4c..583b1dbfd 100644
--- a/tests/src/Model/UserTest.php
+++ b/tests/src/Model/UserTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Friendica\Test\Model;
+namespace Friendica\Test\src\Model;
 
 use Friendica\Model\User;
 use Friendica\Test\MockedTest;
diff --git a/tests/src/Util/ArraysTest.php b/tests/src/Util/ArraysTest.php
index 2028cfc90..a360285da 100644
--- a/tests/src/Util/ArraysTest.php
+++ b/tests/src/Util/ArraysTest.php
@@ -3,7 +3,7 @@
  * @file tests/src/Util/Arrays.php
  * @author Roland Haeder<https://f.haeder.net/profile/roland>
  */
-namespace Friendica\Test\Util;
+namespace Friendica\Test\src\Util;
 
 use Friendica\Util\Arrays;
 use PHPUnit\Framework\TestCase;
diff --git a/tests/src/Util/Logger/WorkerLoggerTest.php b/tests/src/Util/Logger/WorkerLoggerTest.php
index 8ee3c82d8..0713f64d0 100644
--- a/tests/src/Util/Logger/WorkerLoggerTest.php
+++ b/tests/src/Util/Logger/WorkerLoggerTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace src\Util\Logger;
+namespace Friendica\Test\src\Util\Logger;
 
 use Friendica\Test\MockedTest;
 use Friendica\Util\Logger\WorkerLogger;
diff --git a/tests/src/Util/ProfilerTest.php b/tests/src/Util/ProfilerTest.php
index af2e98509..1dbf36f38 100644
--- a/tests/src/Util/ProfilerTest.php
+++ b/tests/src/Util/ProfilerTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace src\Util;
+namespace Friendica\Test\src\Util;
 
 use Friendica\Test\MockedTest;
 use Friendica\Util\Profiler;
diff --git a/tests/src/Util/StringsTest.php b/tests/src/Util/StringsTest.php
index 21349c848..666b76e57 100644
--- a/tests/src/Util/StringsTest.php
+++ b/tests/src/Util/StringsTest.php
@@ -2,7 +2,7 @@
 /**
  * @file tests/src/Util/StringsTest.php
  */
-namespace Friendica\Test\Util;
+namespace Friendica\Test\src\Util;
 
 use Friendica\Util\Strings;
 use PHPUnit\Framework\TestCase;
diff --git a/tests/src/Util/XmlTest.php b/tests/src/Util/XmlTest.php
index ba78e4ff1..97498a3c2 100644
--- a/tests/src/Util/XmlTest.php
+++ b/tests/src/Util/XmlTest.php
@@ -2,7 +2,7 @@
 /**
  * @file tests/src/Util/XmlTest.php
  */
-namespace Friendica\Test\Util;
+namespace Friendica\Test\src\Util;
 
 use Friendica\Util\XML;
 use PHPUnit\Framework\TestCase;