diff --git a/phpunit.xml b/phpunit.xml
index 7bde171b..780192a3 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<phpunit bootstrap="../../tests/bootstrap.php"
+<phpunit bootstrap="tests/unit/bootstrap.php"
         beStrictAboutOutputDuringTests="true"
         verbose="true"
         failOnRisky="true"
@@ -9,6 +9,11 @@
         timeoutForLargeTests="900"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+  <testsuites>
+    <testsuite name="unit">
+      <directory suffix="Test.php">./tests/unit</directory>
+    </testsuite>
+  </testsuites>
   <coverage>
     <include>
       <directory suffix=".php">lib</directory>
@@ -18,13 +23,4 @@
       <clover outputFile="tests/output/clover.xml"/>
     </report>
   </coverage>
-  <testsuites>
-    <testsuite name="unit">
-      <directory suffix="Test.php">./tests/Unit</directory>
-    </testsuite>
-  </testsuites>
-  <!-- filters for code coverage -->
-  <logging>
-    <!-- and this is where your report will be written -->
-  </logging>
 </phpunit>
diff --git a/tests/Unit/AppInfo/AppTest.php b/tests/unit/AppInfo/AppTest.php
similarity index 100%
rename from tests/Unit/AppInfo/AppTest.php
rename to tests/unit/AppInfo/AppTest.php
diff --git a/tests/Unit/AppInfo/ApplicationTest.php b/tests/unit/AppInfo/ApplicationTest.php
similarity index 100%
rename from tests/Unit/AppInfo/ApplicationTest.php
rename to tests/unit/AppInfo/ApplicationTest.php
diff --git a/tests/Unit/AppInfo/RoutesTest.php b/tests/unit/AppInfo/RoutesTest.php
similarity index 100%
rename from tests/Unit/AppInfo/RoutesTest.php
rename to tests/unit/AppInfo/RoutesTest.php
diff --git a/tests/Unit/AppTest.php b/tests/unit/AppTest.php
similarity index 100%
rename from tests/Unit/AppTest.php
rename to tests/unit/AppTest.php
diff --git a/tests/Unit/CapabilitiesTest.php b/tests/unit/CapabilitiesTest.php
similarity index 100%
rename from tests/Unit/CapabilitiesTest.php
rename to tests/unit/CapabilitiesTest.php
diff --git a/tests/Unit/Command/GenerateTest.php b/tests/unit/Command/GenerateTest.php
similarity index 100%
rename from tests/Unit/Command/GenerateTest.php
rename to tests/unit/Command/GenerateTest.php
diff --git a/tests/Unit/Command/RepairNotificationsTest.php b/tests/unit/Command/RepairNotificationsTest.php
similarity index 100%
rename from tests/Unit/Command/RepairNotificationsTest.php
rename to tests/unit/Command/RepairNotificationsTest.php
diff --git a/tests/Unit/Configuration/OptionsStorageTest.php b/tests/unit/Configuration/OptionsStorageTest.php
similarity index 100%
rename from tests/Unit/Configuration/OptionsStorageTest.php
rename to tests/unit/Configuration/OptionsStorageTest.php
diff --git a/tests/Unit/Controller/EndpointControllerTest.php b/tests/unit/Controller/EndpointControllerTest.php
similarity index 100%
rename from tests/Unit/Controller/EndpointControllerTest.php
rename to tests/unit/Controller/EndpointControllerTest.php
diff --git a/tests/Unit/Controller/NotificationOptionsControllerTest.php b/tests/unit/Controller/NotificationOptionsControllerTest.php
similarity index 100%
rename from tests/Unit/Controller/NotificationOptionsControllerTest.php
rename to tests/unit/Controller/NotificationOptionsControllerTest.php
diff --git a/tests/Unit/HandlerTest.php b/tests/unit/HandlerTest.php
similarity index 100%
rename from tests/Unit/HandlerTest.php
rename to tests/unit/HandlerTest.php
diff --git a/tests/Unit/Mailer/NotificationMailerAdapterTest.php b/tests/unit/Mailer/NotificationMailerAdapterTest.php
similarity index 100%
rename from tests/Unit/Mailer/NotificationMailerAdapterTest.php
rename to tests/unit/Mailer/NotificationMailerAdapterTest.php
diff --git a/tests/Unit/Mailer/NotificationMailerTest.php b/tests/unit/Mailer/NotificationMailerTest.php
similarity index 100%
rename from tests/Unit/Mailer/NotificationMailerTest.php
rename to tests/unit/Mailer/NotificationMailerTest.php
diff --git a/tests/Unit/Panels/Personal/NotificationsPanelTest.php b/tests/unit/Panels/Personal/NotificationsPanelTest.php
similarity index 100%
rename from tests/Unit/Panels/Personal/NotificationsPanelTest.php
rename to tests/unit/Panels/Personal/NotificationsPanelTest.php
diff --git a/tests/Unit/TestCase.php b/tests/unit/TestCase.php
similarity index 100%
rename from tests/Unit/TestCase.php
rename to tests/unit/TestCase.php
diff --git a/tests/unit/bootstrap.php b/tests/unit/bootstrap.php
new file mode 100644
index 00000000..dc33c829
--- /dev/null
+++ b/tests/unit/bootstrap.php
@@ -0,0 +1,10 @@
+<?php
+if (!\defined('PHPUNIT_RUN')) {
+	\define('PHPUNIT_RUN', 1);
+}
+
+require_once __DIR__ . '/../../../../lib/base.php';
+
+\OC::$composerAutoloader->addPsr4('Test\\', OC::$SERVERROOT . '/tests/lib/', true);
+// load notification unit test classes
+\OC::$composerAutoloader->addPsr4('OCA\\Notifications\\Tests\\Unit\\', __DIR__, true);