diff --git a/csharp/test/Drivers/Apache/Common/ClientTests.cs b/csharp/test/Drivers/Apache/Common/ClientTests.cs
index eec12960a3..eebb8a908a 100644
--- a/csharp/test/Drivers/Apache/Common/ClientTests.cs
+++ b/csharp/test/Drivers/Apache/Common/ClientTests.cs
@@ -45,7 +45,7 @@ public ClientTests(ITestOutputHelper? outputHelper, TestEnvironment<TConfig>.Fac
         {
             Skip.IfNot(Utils.CanExecuteTestConfig(TestConfigVariable));
         }
-
+        internal virtual string FormatTableName => TestConfiguration.Metadata.Table;
         /// <summary>
         /// Validates if the client execute updates.
         /// </summary>
@@ -73,7 +73,7 @@ public void CanClientGetSchema()
         {
             using (Adbc.Client.AdbcConnection adbcConnection = GetAdbcConnection())
             {
-                Tests.ClientTests.CanClientGetSchema(adbcConnection, TestConfiguration, $"SELECT * FROM {TestConfiguration.Metadata.Table}");
+                Tests.ClientTests.CanClientGetSchema(adbcConnection, TestConfiguration, $"SELECT * FROM {FormatTableName}");
             }
         }
 
@@ -102,7 +102,7 @@ public void CanClientExecuteEmptyQuery()
                 Tests.ClientTests.CanClientExecuteQuery(
                     adbcConnection,
                     TestConfiguration,
-                    customQuery: $"SELECT * FROM {TestConfiguration.Metadata.Table} WHERE FALSE",
+                    customQuery: $"SELECT * FROM {FormatTableName} WHERE FALSE",
                     expectedResultsCount: 0);
             }
         }
diff --git a/csharp/test/Drivers/Apache/Common/DriverTests.cs b/csharp/test/Drivers/Apache/Common/DriverTests.cs
index 8674bc11f3..dd712d86b8 100644
--- a/csharp/test/Drivers/Apache/Common/DriverTests.cs
+++ b/csharp/test/Drivers/Apache/Common/DriverTests.cs
@@ -604,10 +604,12 @@ public async Task CanExecuteQueryAsyncEmptyResult()
             using AdbcConnection adbcConnection = NewConnection();
             using AdbcStatement statement = adbcConnection.CreateStatement();
 
-            statement.SqlQuery = $"SELECT * from {TestConfiguration.Metadata.Table} WHERE FALSE";
+            statement.SqlQuery = $"SELECT * from {FormatTableName} WHERE FALSE";
             QueryResult queryResult = await statement.ExecuteQueryAsync();
 
             await Tests.DriverTests.CanExecuteQueryAsync(queryResult, 0);
         }
+
+        internal virtual string FormatTableName => TestConfiguration.Metadata.Table;
     }
 }
diff --git a/csharp/test/Drivers/Databricks/E2E/ClientTests.cs b/csharp/test/Drivers/Databricks/E2E/ClientTests.cs
index d76ac025a2..0f52bf4973 100644
--- a/csharp/test/Drivers/Databricks/E2E/ClientTests.cs
+++ b/csharp/test/Drivers/Databricks/E2E/ClientTests.cs
@@ -52,5 +52,8 @@ internal static IReadOnlyList<int> GetUpdateExpectedResults(int affectedRows, bo
                     affectedRows,  // DELETE
                   ];
         }
+
+        internal override string FormatTableName =>
+       $"{TestConfiguration.Metadata.Catalog}.{TestConfiguration.Metadata.Schema}.{TestConfiguration.Metadata.Table}";
     }
 }
diff --git a/csharp/test/Drivers/Databricks/E2E/CloudFetch/CloudFetchResultFetcherTest.cs b/csharp/test/Drivers/Databricks/E2E/CloudFetch/CloudFetchResultFetcherTest.cs
index 20fcd956d9..7d17e600b8 100644
--- a/csharp/test/Drivers/Databricks/E2E/CloudFetch/CloudFetchResultFetcherTest.cs
+++ b/csharp/test/Drivers/Databricks/E2E/CloudFetch/CloudFetchResultFetcherTest.cs
@@ -467,7 +467,7 @@ public async Task StopAsync_Timeout()
             Assert.True(timedOut, "Fetch operation should have timed out due to QueryTimeoutSeconds setting");
 
             // Wait a bit for the fetcher to complete its error handling
-            //await Task.Delay(100);
+            await Task.Delay(100);
 
             // Verify the fetcher state
             Assert.True(_resultFetcher.IsCompleted);
diff --git a/csharp/test/Drivers/Databricks/E2E/DriverTests.cs b/csharp/test/Drivers/Databricks/E2E/DriverTests.cs
index 31290b8336..e072ca2a8e 100644
--- a/csharp/test/Drivers/Databricks/E2E/DriverTests.cs
+++ b/csharp/test/Drivers/Databricks/E2E/DriverTests.cs
@@ -182,5 +182,8 @@ protected override bool TypeHasColumnSize(Metadata.AdbcColumn column)
                     return false;
             }
         }
+
+        internal override string FormatTableName =>
+       $"{TestConfiguration.Metadata.Catalog}.{TestConfiguration.Metadata.Schema}.{TestConfiguration.Metadata.Table}";
     }
 }