diff --git a/csharp/test/Drivers/Apache/Spark/SparkConnectionTest.cs b/csharp/test/Drivers/Apache/Spark/SparkConnectionTest.cs
index 6c10bcf922..c1a7606811 100644
--- a/csharp/test/Drivers/Apache/Spark/SparkConnectionTest.cs
+++ b/csharp/test/Drivers/Apache/Spark/SparkConnectionTest.cs
@@ -53,6 +53,12 @@ internal void CanDetectConnectionParameterErrors(ParametersWithExceptions test)
             OutputHelper?.WriteLine(exeption.Message);
         }
 
+        /// <summary>
+        /// Tests connection timeout to establish a session with the backend.
+        /// </summary>
+        /// <param name="connectTimeoutMilliseconds">The timeout (in ms)</param>
+        /// <param name="exceptionType">The exception type to expect (if any)</param>
+        /// <param name="alternateExceptionType">An alternate exception that may occur (if any)</param>
         [SkippableTheory]
         [InlineData(1, typeof(TimeoutException), typeof(TTransportException))]
         [InlineData(10, typeof(TimeoutException), typeof(TTransportException))]
@@ -83,6 +89,10 @@ public void ConnectionTimeoutTest(int? connectTimeoutMilliseconds, Type? excepti
                             // a TTransportException is inside a HiveServer2Exception
                             Assert.IsType(alternateExceptionType, aex.InnerException!.InnerException);
                         }
+                        else
+                        {
+                            throw;
+                        }
                     }
                     else
                     {
@@ -135,6 +145,9 @@ internal void MetadataTimeoutTest(MetadataWithExceptions metadataWithException)
             }
         }
 
+        /// <summary>
+        /// Data type used for metadata timeout tests.
+        /// </summary>
         internal class MetadataWithExceptions
         {
             public MetadataWithExceptions(int? queryTimeoutSeconds, string actionName, Action<SparkTestConfiguration> action, Type? exceptionType, Type? alternateExceptionType)
@@ -225,6 +238,12 @@ public MetadataTimeoutTestData()
                 AddAction("getTableSchema", getTableSchema);
             }
 
+            /// <summary>
+            /// Adds the action with the default timeouts.
+            /// </summary>
+            /// <param name="name">The friendly name of the action.</param>
+            /// <param name="action">The action to perform.</param>
+            /// <param name="alternateExceptions">Optional list of alternate exceptions that are possible. Must have 5 items if present.</param>
             private void AddAction(string name, Action<SparkTestConfiguration> action, List<Type?>? alternateExceptions = null)
             {
                 List<Type?> expectedExceptions = new List<Type?>()
@@ -256,6 +275,11 @@ private void AddAction(string name, Action<SparkTestConfiguration> action, List<
             {
                 Assert.True(expectedExceptions.Count == 5);
 
+                if (alternateExceptions != null)
+                {
+                    Assert.True(alternateExceptions.Count == 5);
+                }
+
                 Add(new(-1, name, action, expectedExceptions[0], alternateExceptions?[0]));
                 Add(new(1, name, action, expectedExceptions[1], alternateExceptions?[1]));
                 Add(new(10, name, action, expectedExceptions[2], alternateExceptions?[2]));
diff --git a/csharp/test/Drivers/Apache/Spark/StatementTests.cs b/csharp/test/Drivers/Apache/Spark/StatementTests.cs
index 2baf40b0d9..cecbaa66f6 100644
--- a/csharp/test/Drivers/Apache/Spark/StatementTests.cs
+++ b/csharp/test/Drivers/Apache/Spark/StatementTests.cs
@@ -23,7 +23,6 @@
 using Thrift.Transport;
 using Xunit;
 using Xunit.Abstractions;
-using static Apache.Arrow.Adbc.Tests.Drivers.Apache.Spark.SparkConnectionTest;
 
 namespace Apache.Arrow.Adbc.Tests.Drivers.Apache.Spark
 {
@@ -139,6 +138,10 @@ public void CanSetOptionQueryTimeout(string value, bool throws = false)
             }
         }
 
+        /// <summary>
+        /// Queries the backend with various timeouts.
+        /// </summary>
+        /// <param name="statementWithExceptions"></param>
         [SkippableTheory]
         [ClassData(typeof(StatementTimeoutTestData))]
         internal void StatementTimeoutTest(StatementWithExceptions statementWithExceptions)
@@ -188,6 +191,9 @@ public async Task CanInteractUsingSetOptions()
         }
     }
 
+    /// <summary>
+    /// Data type used for metadata timeout tests.
+    /// </summary>
     internal class StatementWithExceptions
     {
         public StatementWithExceptions(int? queryTimeoutSeconds, string? query, Type? exceptionType)
@@ -208,11 +214,14 @@ public StatementWithExceptions(int? queryTimeoutSeconds, string? query, Type? ex
         public Type? ExceptionType { get; }
 
         /// <summary>
-        /// If null, uses the default TestConfiguration
+        /// If null, uses the default TestConfiguration.
         /// </summary>
         public string? Query { get; }
     }
 
+    /// <summary>
+    /// Collection of <see cref="StatementWithExceptions"/> for testing statement timeouts."/>
+    /// </summary>
     internal class StatementTimeoutTestData : TheoryData<StatementWithExceptions>
     {
         public StatementTimeoutTestData()