diff --git a/tests/phpunit-autotest.xml b/tests/phpunit-autotest.xml
index 18d40d86ef715e65164deee16f321b9eff5b4bb1..2bf3ca3cf9de53af5c9b2ef83ff740f9db2c5bc3 100644
--- a/tests/phpunit-autotest.xml
+++ b/tests/phpunit-autotest.xml
@@ -22,15 +22,12 @@
 				<directory suffix=".php">../apps/files/l10n</directory>
 				<directory suffix=".php">../apps/files_external</directory>
 				<directory suffix=".php">../apps/files_versions/l10n</directory>
-				<directory suffix=".php">../apps/files_encryption/l10n</directory>
-				<directory suffix=".php">../apps/files_encryption/3rdparty</directory>
+				<directory suffix=".php">../apps/encryption/l10n</directory>
 				<directory suffix=".php">../apps/files_sharing/l10n</directory>
 				<directory suffix=".php">../apps/files_trashbin/l10n</directory>
 				<directory suffix=".php">../apps/user_ldap/l10n</directory>
 				<directory suffix=".php">../apps/user_webdavauth/l10n</directory>
-				<directory suffix=".php">../provisioning_api/l10n</directory>
-				<directory suffix=".php">../provisioning_api/tests</directory>
-				<directory suffix=".php">../lib/MDB2</directory>
+				<directory suffix=".php">../apps/provisioning_api/tests</directory>
 				<directory suffix=".php">../lib/l10n</directory>
 				<directory suffix=".php">../core/l10n</directory>
 				<directory suffix=".php">../settings/l10n</directory>
diff --git a/tests/phpunit.xml.dist b/tests/phpunit.xml.dist
index c1d02dd32a047216e724fab27843c823a28cf32c..346c8f5f9c98822a458721b41afc6218c38bebca 100644
--- a/tests/phpunit.xml.dist
+++ b/tests/phpunit.xml.dist
@@ -17,15 +17,12 @@
 				<directory suffix=".php">../apps/files_external/l10n</directory>
 				<directory suffix=".php">../apps/files_external/3rdparty</directory>
 				<directory suffix=".php">../apps/files_versions/l10n</directory>
-				<directory suffix=".php">../apps/files_encryption/l10n</directory>
-				<directory suffix=".php">../apps/files_encryption/3rdparty</directory>
+				<directory suffix=".php">../apps/encryption/l10n</directory>
 				<directory suffix=".php">../apps/files_sharing/l10n</directory>
 				<directory suffix=".php">../apps/files_trashbin/l10n</directory>
 				<directory suffix=".php">../apps/user_ldap/l10n</directory>
 				<directory suffix=".php">../apps/user_webdavauth/l10n</directory>
-				<directory suffix=".php">../provisioning_api/l10n</directory>
-				<directory suffix=".php">../provisioning_api/tests</directory>
-				<directory suffix=".php">../lib/MDB2</directory>
+				<directory suffix=".php">../apps/provisioning_api/tests</directory>
 				<directory suffix=".php">../lib/l10n</directory>
 				<directory suffix=".php">../core/l10n</directory>
 				<directory suffix=".php">../settings/l10n</directory>