diff --git a/test/php/Makefile b/modules/test/Makefile
similarity index 100%
rename from test/php/Makefile
rename to modules/test/Makefile
diff --git a/test/php/bin/README b/modules/test/bin/README
similarity index 100%
rename from test/php/bin/README
rename to modules/test/bin/README
diff --git a/test/php/bin/common.h b/modules/test/bin/common.h
similarity index 100%
rename from test/php/bin/common.h
rename to modules/test/bin/common.h
diff --git a/test/php/bin/extcmd_test.c b/modules/test/bin/extcmd_test.c
similarity index 100%
rename from test/php/bin/extcmd_test.c
rename to modules/test/bin/extcmd_test.c
diff --git a/test/php/bin/shared.h b/modules/test/bin/shared.h
similarity index 100%
rename from test/php/bin/shared.h
rename to modules/test/bin/shared.h
diff --git a/test/php/phpunit.xml b/modules/test/phpunit.xml
similarity index 72%
rename from test/php/phpunit.xml
rename to modules/test/phpunit.xml
index b36e81fe8..83fc9d9ac 100644
--- a/test/php/phpunit.xml
+++ b/modules/test/phpunit.xml
@@ -1,25 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
-<phpunit bootstrap="bootstrap.php">
+<phpunit bootstrap="../../test/php/bootstrap.php">
     <testsuites>
         <!--
             Unit testing
         -->
         <testsuite name="unit">
-            <directory>application/</directory>
-            <directory>bin/</directory>
-            <directory>library/</directory>
+            <directory>../../test/php/application/</directory>
+            <directory>../../test/php/library/</directory>
 
             <!-- Module tests are independent from core tests -->
-            <directory>../../modules/*/test/php</directory>
-            <exclude>../../modules/*/test/php/regression</exclude>
+            <directory>../*/test/php</directory>
+            <exclude>../*/test/php/regression</exclude>
         </testsuite>
 
         <!--
             Regression testing
         -->
         <testsuite name="regression">
-            <directory>regression/</directory>
-            <directory>../../modules/*/test/regression</directory>
+            <directory>../../test/php/regression/</directory>
+            <directory>../*/test/php/regression</directory>
         </testsuite>
     </testsuites>
     <filter>