diff --git a/apps/files_external/tests/Controller/UserStoragesControllerTest.php b/apps/files_external/tests/Controller/UserStoragesControllerTest.php
index ac8d466374..8960c63f0c 100644
--- a/apps/files_external/tests/Controller/UserStoragesControllerTest.php
+++ b/apps/files_external/tests/Controller/UserStoragesControllerTest.php
@@ -23,6 +23,7 @@
 namespace OCA\Files_External\Tests\Controller;
 
 use \OCA\Files_External\Controller\UserStoragesController;
+use OCA\Files_External\Lib\StorageConfig;
 use \OCP\AppFramework\Http;
 use \OCA\Files_External\Service\BackendService;
 
diff --git a/apps/files_external/tests/Service/UserGlobalStoragesServiceTest.php b/apps/files_external/tests/Service/UserGlobalStoragesServiceTest.php
index 4a03b6194e..07ef45c331 100644
--- a/apps/files_external/tests/Service/UserGlobalStoragesServiceTest.php
+++ b/apps/files_external/tests/Service/UserGlobalStoragesServiceTest.php
@@ -22,6 +22,7 @@
  */
 namespace OCA\Files_External\Tests\Service;
 
+use OCA\Files_External\Lib\StorageConfig;
 use OCA\Files_External\NotFoundException;
 use OCA\Files_External\Service\StoragesService;
 use OCA\Files_External\Service\UserGlobalStoragesService;
diff --git a/tests/phpunit-autotest-external.xml b/tests/phpunit-autotest-external.xml
index 1b48c4dc11..e70391e346 100644
--- a/tests/phpunit-autotest-external.xml
+++ b/tests/phpunit-autotest-external.xml
@@ -8,13 +8,13 @@
 	<testsuite name='ownCloud files external'>
 		<directory suffix=".php">../apps/files_external/tests</directory>
 		<!-- exclude backends as they are called separately -->
-		<exclude>../apps/files_external/tests/storage/</exclude>
+		<exclude>../apps/files_external/tests/Storage/</exclude>
 	</testsuite>
 	<!-- filters for code coverage -->
 	<filter>
 		<!-- whitelist processUncoveredFilesFromWhitelist="true" -->
 		<whitelist>
-			<file>../lib/private/files/storage/dav.php</file>
+			<file>../lib/private/Files/Storage/DAV.php</file>
 			<directory suffix=".php">../apps/files_external</directory>
 			<exclude>
 				<directory suffix=".php">../apps/files_external/l10n</directory>