diff --git a/apps/files_sharing/tests/Command/CleanupRemoteStoragesTest.php b/apps/files_sharing/tests/Command/CleanupRemoteStoragesTest.php
index fae07bccfa74b5179a7755f3a9cd81b5e4aed130..803ee1d02c99b0ae1381ee801c1099233e06d760 100644
--- a/apps/files_sharing/tests/Command/CleanupRemoteStoragesTest.php
+++ b/apps/files_sharing/tests/Command/CleanupRemoteStoragesTest.php
@@ -54,48 +54,48 @@ class CleanupRemoteStoragesTest extends TestCase {
 
 		$storageQuery = \OC::$server->getDatabaseConnection()->getQueryBuilder();
 		$storageQuery->insert('storages')
-			->setValue('id', '?');
+			->setValue('id', $storageQuery->createParameter('id'));
 
 		$shareExternalQuery = \OC::$server->getDatabaseConnection()->getQueryBuilder();
 		$shareExternalQuery->insert('share_external')
-			->setValue('share_token', '?')
-			->setValue('remote', '?')
-			->setValue('name', '?')
-			->setValue('owner', '?')
-			->setValue('user', '?')
-			->setValue('mountpoint', '?')
-			->setValue('mountpoint_hash', '?');
+			->setValue('share_token', $shareExternalQuery->createParameter('share_token'))
+			->setValue('remote', $shareExternalQuery->createParameter('remote'))
+			->setValue('name', $shareExternalQuery->createParameter('name'))
+			->setValue('owner', $shareExternalQuery->createParameter('owner'))
+			->setValue('user', $shareExternalQuery->createParameter('user'))
+			->setValue('mountpoint', $shareExternalQuery->createParameter('mountpoint'))
+			->setValue('mountpoint_hash', $shareExternalQuery->createParameter('mountpoint_hash'));
 
 		$filesQuery = \OC::$server->getDatabaseConnection()->getQueryBuilder();
 		$filesQuery->insert('filecache')
-			->setValue('storage', '?')
-			->setValue('path', '?')
-			->setValue('path_hash', '?');
+			->setValue('storage', $filesQuery->createParameter('storage'))
+			->setValue('path', $filesQuery->createParameter('path'))
+			->setValue('path_hash', $filesQuery->createParameter('path_hash'));
 
 		foreach ($this->storages as &$storage) {
 			if (isset($storage['id'])) {
-				$storageQuery->setParameter(0, $storage['id']);
+				$storageQuery->setParameter('id', $storage['id']);
 				$storageQuery->execute();
 				$storage['numeric_id'] = $storageQuery->getLastInsertId();
 			}
 
 			if (isset($storage['share_token'])) {
 				$shareExternalQuery
-					->setParameter(0, $storage['share_token'])
-					->setParameter(1, $storage['remote'])
-					->setParameter(2, 'irrelevant')
-					->setParameter(3, 'irrelevant')
-					->setParameter(4, $storage['user'])
-					->setParameter(5, 'irrelevant')
-					->setParameter(6, 'irrelevant');
+					->setParameter('share_token', $storage['share_token'])
+					->setParameter('remote', $storage['remote'])
+					->setParameter('name', 'irrelevant')
+					->setParameter('owner', 'irrelevant')
+					->setParameter('user', $storage['user'])
+					->setParameter('mountpoint', 'irrelevant')
+					->setParameter('mountpoint_hash', 'irrelevant');
 				$shareExternalQuery->executeStatement();
 			}
 
 			if (isset($storage['files_count'])) {
 				for ($i = 0; $i < $storage['files_count']; $i++) {
-					$filesQuery->setParameter(0, $storage['numeric_id']);
-					$filesQuery->setParameter(1, 'file' . $i);
-					$filesQuery->setParameter(2, md5('file' . $i));
+					$filesQuery->setParameter('storage', $storage['numeric_id']);
+					$filesQuery->setParameter('path', 'file' . $i);
+					$filesQuery->setParameter('path_hash', md5('file' . $i));
 					$filesQuery->executeStatement();
 				}
 			}
diff --git a/apps/files_sharing/tests/TestCase.php b/apps/files_sharing/tests/TestCase.php
index 4aaeec1f76587c45fbe8f355b969c7fd0982b63c..3fe2993e189d16ec392c4573ead4f2341de5e523 100644
--- a/apps/files_sharing/tests/TestCase.php
+++ b/apps/files_sharing/tests/TestCase.php
@@ -118,7 +118,7 @@ abstract class TestCase extends \Test\TestCase {
 		$qb->execute();
 
 		$qb = \OC::$server->getDatabaseConnection()->getQueryBuilder();
-		$qb->delete('filecache');
+		$qb->delete('filecache')->runAcrossAllShards();
 		$qb->execute();
 
 		parent::tearDown();
diff --git a/lib/private/DB/QueryBuilder/QueryBuilder.php b/lib/private/DB/QueryBuilder/QueryBuilder.php
index 32c50c0852e17af67e73d422fa4583318fb9e06d..5c4da55759298e90ebe07b1e884fd26dda9ea9e5 100644
--- a/lib/private/DB/QueryBuilder/QueryBuilder.php
+++ b/lib/private/DB/QueryBuilder/QueryBuilder.php
@@ -23,7 +23,6 @@ use OC\DB\QueryBuilder\FunctionBuilder\FunctionBuilder;
 use OC\DB\QueryBuilder\FunctionBuilder\OCIFunctionBuilder;
 use OC\DB\QueryBuilder\FunctionBuilder\PgSqlFunctionBuilder;
 use OC\DB\QueryBuilder\FunctionBuilder\SqliteFunctionBuilder;
-use OC\DB\ResultAdapter;
 use OC\SystemConfig;
 use OCP\DB\IResult;
 use OCP\DB\QueryBuilder\ICompositeExpression;