diff --git a/tests/Backend/WorkspaceConnectionTrait.php b/tests/Backend/WorkspaceConnectionTrait.php
index 7eb8d1577..3718a3c78 100644
--- a/tests/Backend/WorkspaceConnectionTrait.php
+++ b/tests/Backend/WorkspaceConnectionTrait.php
@@ -21,7 +21,7 @@ trait WorkspaceConnectionTrait
     /**
      * @return SnowflakeConnection|DBALConnection|\PDO|BigQueryClient
      */
-    private function getDbConnection(array $connection)
+    private function getDbConnection(array $connection, int $retriesCount = 20)
     {
         switch ($connection['backend']) {
             case StorageApiTestCase::BACKEND_SNOWFLAKE:
@@ -35,7 +35,7 @@ private function getDbConnection(array $connection)
             case StorageApiTestCase::BACKEND_TERADATA:
                 return $this->getDbConnectionTeradata($connection);
             case StorageApiTestCase::BACKEND_BIGQUERY:
-                return $this->getDbConnectionBigquery($connection);
+                return $this->getDbConnectionBigquery($connection, $retriesCount);
         }
 
         throw new \Exception('Unsupported Backend for workspaces');
@@ -148,14 +148,14 @@ private function getDbConnectionTeradata(array $connection): DBALConnection
         return $db;
     }
 
-    private function getDbConnectionBigquery(array $connection): BigQueryClient
+    private function getDbConnectionBigquery(array $connection, int $retriesCount): BigQueryClient
     {
         // note: the close method is not used in this client
         $bqClient = new BigQueryClientWrapper([
             'keyFile' => $connection['credentials'],
             'restRetryFunction' => Retry::getRestRetryFunction(new NullLogger()),
             'requestTimeout' => 120,
-            'retries' => 10,
+            'retries' => $retriesCount,
         ], 'sapitest');
 
         $bqClient->runQuery(
diff --git a/tests/Backend/WorkspaceCredentialsAssertTrait.php b/tests/Backend/WorkspaceCredentialsAssertTrait.php
index 090cf69d3..695908529 100644
--- a/tests/Backend/WorkspaceCredentialsAssertTrait.php
+++ b/tests/Backend/WorkspaceCredentialsAssertTrait.php
@@ -23,7 +23,7 @@ private function assertCredentialsShouldNotWork($connection): void
         try {
             $proxy = new RetryProxy($retryPolicy, new ExponentialBackOffPolicy());
             $proxy->call(function () use ($connection) {
-                $this->getDbConnection($connection);
+                $this->getDbConnection($connection, 1);
                 throw new \Exception(self::$RETRY_FAIL_MESSAGE);
             });
         } catch (\Doctrine\DBAL\Driver\Exception $e) {
diff --git a/tests/Backend/Workspaces/Backend/BigqueryWorkspaceBackend.php b/tests/Backend/Workspaces/Backend/BigqueryWorkspaceBackend.php
index f5d369f0d..a1b086787 100644
--- a/tests/Backend/Workspaces/Backend/BigqueryWorkspaceBackend.php
+++ b/tests/Backend/Workspaces/Backend/BigqueryWorkspaceBackend.php
@@ -29,13 +29,13 @@ class BigqueryWorkspaceBackend implements WorkspaceBackend
     /**
      * @param array $workspace
      */
-    public function __construct(array $workspace, int $retriesCount)
+    public function __construct(array $workspace)
     {
         $bqClient = new BigQueryClientWrapper([
             'keyFile' => $workspace['connection']['credentials'],
             'restRetryFunction' => Retry::getRestRetryFunction(new NullLogger()),
             'requestTimeout' => 120,
-            'retries' => $retriesCount,
+            'retries' => 20,
         ], 'sapitest');
 
         $this->bqClient = $bqClient;
diff --git a/tests/Backend/Workspaces/Backend/WorkspaceBackendFactory.php b/tests/Backend/Workspaces/Backend/WorkspaceBackendFactory.php
index a79d81d69..ff9dc63ef 100644
--- a/tests/Backend/Workspaces/Backend/WorkspaceBackendFactory.php
+++ b/tests/Backend/Workspaces/Backend/WorkspaceBackendFactory.php
@@ -16,7 +16,7 @@ class WorkspaceBackendFactory
     /**
      * @param array<mixed> $workspace
      */
-    public static function createWorkspaceBackend(array $workspace, bool $useDBAL = false, int $retriesCount = 10): WorkspaceBackend
+    public static function createWorkspaceBackend(array $workspace, bool $useDBAL = false): WorkspaceBackend
     {
         switch ($workspace['connection']['backend']) {
             case StorageApiTestCase::BACKEND_REDSHIFT:
@@ -33,7 +33,7 @@ public static function createWorkspaceBackend(array $workspace, bool $useDBAL =
             case StorageApiTestCase::BACKEND_TERADATA:
                 return new TeradataWorkspaceBackend($workspace);
             case StorageApiTestCase::BACKEND_BIGQUERY:
-                return new BigqueryWorkspaceBackend($workspace, $retriesCount);
+                return new BigqueryWorkspaceBackend($workspace);
             default:
                 throw new Exception($workspace['connection']['backend'] . ' workspaces are not supported.');
         }
diff --git a/tests/Backend/Workspaces/WorkspacesTest.php b/tests/Backend/Workspaces/WorkspacesTest.php
index a0b5c25a3..11e4a7368 100644
--- a/tests/Backend/Workspaces/WorkspacesTest.php
+++ b/tests/Backend/Workspaces/WorkspacesTest.php
@@ -95,7 +95,7 @@ public function testWorkspaceCreate(bool $async): void
         $tokenInfo = $this->_client->verifyToken();
         $this->assertEquals($tokenInfo['owner']['defaultBackend'], $connection['backend']);
 
-        $backend = WorkspaceBackendFactory::createWorkspaceBackend($workspace, false, 2);
+        $backend = WorkspaceBackendFactory::createWorkspaceBackend($workspace);
 
         if ($workspaceWithSnowflakeBackend) {
             $db = $backend->getDb();
@@ -254,7 +254,7 @@ public function testWorkspacePasswordReset(): void
         $tokenInfo = $this->_client->verifyToken();
         $this->assertEquals($tokenInfo['owner']['defaultBackend'], $connection['backend']);
 
-        $backend = WorkspaceBackendFactory::createWorkspaceBackend($workspace, false, 2);
+        $backend = WorkspaceBackendFactory::createWorkspaceBackend($workspace);
         $backend->dropTableIfExists('mytable');
 
         $backend->createTable('mytable', ['amount' => $this->getColumnAmountType($connection['backend'])]);
diff --git a/tests/Common/BranchWorkspacesTest.php b/tests/Common/BranchWorkspacesTest.php
index 7706cf027..2d3919428 100644
--- a/tests/Common/BranchWorkspacesTest.php
+++ b/tests/Common/BranchWorkspacesTest.php
@@ -63,7 +63,7 @@ public function testWorkspaceCreate(bool $async): void
         $tokenInfo = $this->_client->verifyToken();
         $this->assertEquals($tokenInfo['owner']['defaultBackend'], $connection['backend']);
 
-        $backend = WorkspaceBackendFactory::createWorkspaceBackend($workspace, false, 2);
+        $backend = WorkspaceBackendFactory::createWorkspaceBackend($workspace);
         $backend->createTable('mytable', ['amount' => ($connection['backend'] === self::BACKEND_SNOWFLAKE) ? 'NUMBER' : 'VARCHAR']);
 
         $tableNames = $backend->getTables();
@@ -124,7 +124,7 @@ public function testWorkspacePasswordReset(): void
         $tokenInfo = $this->_client->verifyToken();
         $this->assertEquals($tokenInfo['owner']['defaultBackend'], $connection['backend']);
 
-        $backend = WorkspaceBackendFactory::createWorkspaceBackend($workspace, false, 2);
+        $backend = WorkspaceBackendFactory::createWorkspaceBackend($workspace);
         $backend->dropTableIfExists('mytable');
         $backend->createTable('mytable', ['amount' => ($connection['backend'] === self::BACKEND_SNOWFLAKE) ? 'NUMBER' : 'VARCHAR']);