diff --git a/tests/phpunit.xml b/tests/phpunit.xml
index e461d09c0..7bf986255 100644
--- a/tests/phpunit.xml
+++ b/tests/phpunit.xml
@@ -15,13 +15,13 @@
       <directory suffix="Test.php">./unit/</directory>
     </testsuite>
     <testsuite name="Hubzilla addons unit tests">
-      <directory suffix="Test.php">../extend/addon/*/*/tests/unit/</directory>
+      <directory suffix="Test.php">../extend/addon/*/*/tests/</directory>
     </testsuite>
     <testsuite name="Hubzilla themes unit tests">
-      <directory suffix="Test.php">../extend/theme/*/*/tests/unit/</directory>
+      <directory suffix="Test.php">../extend/theme/*/*/tests/</directory>
     </testsuite>
     <testsuite name="Hubzilla widgets unit tests">
-      <directory suffix="Test.php">../extend/widget/*/*/tests/unit/</directory>
+      <directory suffix="Test.php">../extend/widget/*/*/tests/</directory>
     </testsuite>
   </testsuites>
   <source>
diff --git a/tests/unit/Module/TestCase.php b/tests/unit/Module/TestCase.php
index 1f9c03cb2..85a747a2d 100644
--- a/tests/unit/Module/TestCase.php
+++ b/tests/unit/Module/TestCase.php
@@ -44,8 +44,8 @@ class TestCase extends UnitTestCase {
 		$_SERVER['SERVER_PROTOCOL'] = 'HTTP/1.1';
 		$_SERVER['QUERY_STRING'] = "q={$uri}";
 		$_SERVER['REQUEST_URI'] = $uri;
-		$_SERVER['CONTENT_TYPE'] = 'text/html';
-		$_SERVER['CONTENT_LENGTH'] = 0;
+		$_SERVER['HTTP_CONTENT_TYPE'] = 'text/html';
+		$_SERVER['HTTP_CONTENT_LENGTH'] = 0;
 
 		// phpcs:disable Generic.PHP.DisallowRequestSuperglobal.Found
 		$_REQUEST = array_merge($_GET, $_POST);