diff --git a/.github/phpunit-mariadb-github.xml b/.github/phpunit-mariadb-github.xml
index e301ced053..d5ab282b3d 100644
--- a/.github/phpunit-mariadb-github.xml
+++ b/.github/phpunit-mariadb-github.xml
@@ -23,6 +23,18 @@
       <group>slow</group>
     </exclude>
   </groups>
+  <source restrictDeprecations="true">
+    <include>
+      <directory suffix=".php">../phpBB/</directory>
+      <directory suffix=".php">../tests/</directory>
+    </include>
+    <exclude>
+      <directory suffix=".php">../phpBB/vendor/</directory>
+      <directory suffix=".php">../phpBB/cache/</directory>
+      <directory suffix=".php">../phpBB/develop/</directory>
+      <directory suffix=".php">../phpBB/store/</directory>
+    </exclude>
+  </source>
   <php>
     <server name="PHPBB_TEST_DBMS" value="mysqli"/>
     <server name="PHPBB_TEST_DBHOST" value="0.0.0.0"/>
diff --git a/.github/phpunit-mssql-github.xml b/.github/phpunit-mssql-github.xml
index b3061cce0e..bd240fa534 100644
--- a/.github/phpunit-mssql-github.xml
+++ b/.github/phpunit-mssql-github.xml
@@ -23,6 +23,18 @@
       <group>slow</group>
     </exclude>
   </groups>
+  <source restrictDeprecations="true">
+    <include>
+      <directory suffix=".php">../phpBB/</directory>
+      <directory suffix=".php">../tests/</directory>
+    </include>
+    <exclude>
+      <directory suffix=".php">../phpBB/vendor/</directory>
+      <directory suffix=".php">../phpBB/cache/</directory>
+      <directory suffix=".php">../phpBB/develop/</directory>
+      <directory suffix=".php">../phpBB/store/</directory>
+    </exclude>
+  </source>
   <php>
     <server name="PHPBB_TEST_DBMS" value="phpbb\db\driver\mssqlnative"/>
     <server name="PHPBB_TEST_DBHOST" value="127.0.0.1"/>
diff --git a/.github/phpunit-mysql-github.xml b/.github/phpunit-mysql-github.xml
index e15519e8b2..ff42cf36df 100644
--- a/.github/phpunit-mysql-github.xml
+++ b/.github/phpunit-mysql-github.xml
@@ -23,6 +23,18 @@
       <group>slow</group>
     </exclude>
   </groups>
+  <source restrictDeprecations="true">
+    <include>
+      <directory suffix=".php">../phpBB/</directory>
+      <directory suffix=".php">../tests/</directory>
+    </include>
+    <exclude>
+      <directory suffix=".php">../phpBB/vendor/</directory>
+      <directory suffix=".php">../phpBB/cache/</directory>
+      <directory suffix=".php">../phpBB/develop/</directory>
+      <directory suffix=".php">../phpBB/store/</directory>
+    </exclude>
+  </source>
   <php>
     <server name="PHPBB_TEST_DBMS" value="phpbb\db\driver\mysqli"/>
     <server name="PHPBB_TEST_DBHOST" value="0.0.0.0"/>
diff --git a/.github/phpunit-postgres-github.xml b/.github/phpunit-postgres-github.xml
index 57333dacc5..1636901039 100644
--- a/.github/phpunit-postgres-github.xml
+++ b/.github/phpunit-postgres-github.xml
@@ -23,6 +23,18 @@
       <group>slow</group>
     </exclude>
   </groups>
+  <source restrictDeprecations="true">
+    <include>
+      <directory suffix=".php">../phpBB/</directory>
+      <directory suffix=".php">../tests/</directory>
+    </include>
+    <exclude>
+      <directory suffix=".php">../phpBB/vendor/</directory>
+      <directory suffix=".php">../phpBB/cache/</directory>
+      <directory suffix=".php">../phpBB/develop/</directory>
+      <directory suffix=".php">../phpBB/store/</directory>
+    </exclude>
+  </source>
   <php>
     <server name="PHPBB_TEST_DBMS" value="phpbb\db\driver\postgres"/>
     <server name="PHPBB_TEST_DBHOST" value="localhost"/>
diff --git a/.github/phpunit-psql-windows-github.xml b/.github/phpunit-psql-windows-github.xml
index ab0c060010..0b80da0774 100644
--- a/.github/phpunit-psql-windows-github.xml
+++ b/.github/phpunit-psql-windows-github.xml
@@ -23,6 +23,18 @@
       <group>slow</group>
     </exclude>
   </groups>
+  <source restrictDeprecations="true">
+    <include>
+      <directory suffix=".php">../phpBB/</directory>
+      <directory suffix=".php">../tests/</directory>
+    </include>
+    <exclude>
+      <directory suffix=".php">../phpBB/vendor/</directory>
+      <directory suffix=".php">../phpBB/cache/</directory>
+      <directory suffix=".php">../phpBB/develop/</directory>
+      <directory suffix=".php">../phpBB/store/</directory>
+    </exclude>
+  </source>
   <php>
     <server name="PHPBB_TEST_DBMS" value="phpbb\db\driver\postgres"/>
     <server name="PHPBB_TEST_DBHOST" value="localhost"/>
diff --git a/.github/phpunit-sqlite3-github.xml b/.github/phpunit-sqlite3-github.xml
index 5c7e931b48..1ade12292c 100644
--- a/.github/phpunit-sqlite3-github.xml
+++ b/.github/phpunit-sqlite3-github.xml
@@ -23,6 +23,18 @@
       <group>slow</group>
     </exclude>
   </groups>
+  <source restrictDeprecations="true">
+    <include>
+      <directory suffix=".php">../phpBB/</directory>
+      <directory suffix=".php">../tests/</directory>
+    </include>
+    <exclude>
+      <directory suffix=".php">../phpBB/vendor/</directory>
+      <directory suffix=".php">../phpBB/cache/</directory>
+      <directory suffix=".php">../phpBB/develop/</directory>
+      <directory suffix=".php">../phpBB/store/</directory>
+    </exclude>
+  </source>
   <php>
     <server name="PHPBB_TEST_REDIS_HOST" value="0.0.0.0"/>
     <server name="PHPBB_TEST_MEMCACHED_HOST" value="localhost"/>
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 58d0d5c1df..6240baa320 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -26,10 +26,16 @@
       <group>slow</group>
     </exclude>
   </groups>
-  <source>
+  <source restrictDeprecations="true">
     <include>
-      <directory suffix=".php">./phpBB/includes/</directory>
-      <directory suffix=".php">./phpBB/phpbb/</directory>
+      <directory suffix=".php">./phpBB/</directory>
+      <directory suffix=".php">./tests/</directory>
     </include>
+    <exclude>
+      <directory suffix=".php">./phpBB/vendor/</directory>
+      <directory suffix=".php">./phpBB/cache/</directory>
+      <directory suffix=".php">./phpBB/develop/</directory>
+      <directory suffix=".php">./phpBB/store/</directory>
+    </exclude>
   </source>
 </phpunit>