diff --git a/tests/Metadata/SAMLBuilderTest.php b/tests/lib/SimpleSAML/Metadata/SAMLBuilderTest.php
similarity index 100%
rename from tests/Metadata/SAMLBuilderTest.php
rename to tests/lib/SimpleSAML/Metadata/SAMLBuilderTest.php
diff --git a/tests/Utils/ArraysTest.php b/tests/lib/SimpleSAML/Utils/ArraysTest.php
similarity index 100%
rename from tests/Utils/ArraysTest.php
rename to tests/lib/SimpleSAML/Utils/ArraysTest.php
diff --git a/tests/Metadata/MetadataTest.php b/tests/lib/SimpleSAML/Utils/Config/MetadataTest.php
similarity index 100%
rename from tests/Metadata/MetadataTest.php
rename to tests/lib/SimpleSAML/Utils/Config/MetadataTest.php
diff --git a/tests/Utils/NetTest.php b/tests/lib/SimpleSAML/Utils/NetTest.php
similarity index 100%
rename from tests/Utils/NetTest.php
rename to tests/lib/SimpleSAML/Utils/NetTest.php
diff --git a/tests/modules/core/AttributeAddTest.php b/tests/modules/core/lib/Auth/Process/AttributeAddTest.php
similarity index 100%
rename from tests/modules/core/AttributeAddTest.php
rename to tests/modules/core/lib/Auth/Process/AttributeAddTest.php
diff --git a/tools/phpunit/phpunit.xml b/tools/phpunit/phpunit.xml
index 5526f19ee5a72e143c3a4558a5fb0063e3909ad5..2a4cb9373002a2fdc2c30d3aa83624d8f1d6858d 100644
--- a/tools/phpunit/phpunit.xml
+++ b/tools/phpunit/phpunit.xml
@@ -10,14 +10,8 @@
          syntaxCheck="false"
          bootstrap="./../../vendor/autoload.php">
     <testsuites>
-        <testsuite name="Utils">
-            <directory>./../../tests/Utils/</directory>
-        </testsuite>
-        <testsuite name="Metadata">
-            <directory>./../../tests/Metadata/</directory>
-        </testsuite>
-        <testsuite name="modules-core">
-            <directory>./../../tests/modules/core/</directory>
+        <testsuite name="Unit tests">
+            <directory>./../../tests/</directory>
         </testsuite>
     </testsuites>
     <filter>