diff --git a/tests/include/ApiTest.php b/tests/legacy/ApiTest.php
similarity index 99%
rename from tests/include/ApiTest.php
rename to tests/legacy/ApiTest.php
index ceeaac6f6f..101356e52e 100644
--- a/tests/include/ApiTest.php
+++ b/tests/legacy/ApiTest.php
@@ -3,7 +3,7 @@
  * ApiTest class.
  */
 
-namespace Friendica\Test;
+namespace Friendica\Test\legacy;
 
 use Friendica\App;
 use Friendica\Core\Config\IConfig;
@@ -11,6 +11,7 @@ use Friendica\Core\PConfig\IPConfig;
 use Friendica\Core\Protocol;
 use Friendica\DI;
 use Friendica\Network\HTTPException;
+use Friendica\Test\FixtureTest;
 use Friendica\Util\Temporal;
 use Monolog\Handler\TestHandler;
 
diff --git a/tests/src/Content/Text/BBCode/VideoTest.php b/tests/src/Content/Text/BBCode/VideoTest.php
index 2a3cef75af..3d1b24fb79 100644
--- a/tests/src/Content/Text/BBCode/VideoTest.php
+++ b/tests/src/Content/Text/BBCode/VideoTest.php
@@ -19,7 +19,7 @@
  *
  */
 
-namespace Friendica\Test\Content\Text\BBCode;
+namespace Friendica\Test\src\Content\Text\BBCode;
 
 use Friendica\Content\Text\BBCode\Video;
 use Friendica\Test\MockedTest;
diff --git a/tests/src/Core/L10nTest.php b/tests/src/Core/L10nTest.php
index 66a96892d0..003ff0f8ac 100644
--- a/tests/src/Core/L10nTest.php
+++ b/tests/src/Core/L10nTest.php
@@ -19,7 +19,7 @@
  *
  */
 
-namespace Friendica\Test\src\Core\L10n;
+namespace Friendica\Test\src\Core;
 
 use Friendica\Core\L10n;
 use Friendica\Test\MockedTest;
diff --git a/tests/src/Core/Lock/DatabaseLockTest.php b/tests/src/Core/Lock/DatabaseLockDriverTest.php
similarity index 100%
rename from tests/src/Core/Lock/DatabaseLockTest.php
rename to tests/src/Core/Lock/DatabaseLockDriverTest.php
diff --git a/tests/src/Protocol/ActivityTest.php b/tests/src/Protocol/ActivityTest.php
index 31ff8efc11..edea12fdff 100644
--- a/tests/src/Protocol/ActivityTest.php
+++ b/tests/src/Protocol/ActivityTest.php
@@ -19,7 +19,7 @@
  *
  */
 
-namespace Friendica\Test\Protocol;
+namespace Friendica\Test\src\Protocol;
 
 use Friendica\Protocol\Activity;
 use Friendica\Protocol\ActivityNamespace;
diff --git a/tests/src/Util/JSonLDTest.php b/tests/src/Util/JsonLDTest.php
similarity index 100%
rename from tests/src/Util/JSonLDTest.php
rename to tests/src/Util/JsonLDTest.php