diff --git a/spark-connect/client/src/test/scala-spark-master/io/delta/connect/tables/RemoteSparkSession.scala b/spark-connect/client/src/test/scala-spark-master/io/delta/connect/tables/RemoteSparkSession.scala
index d22f9f5691c..9514e652110 100644
--- a/spark-connect/client/src/test/scala-spark-master/io/delta/connect/tables/RemoteSparkSession.scala
+++ b/spark-connect/client/src/test/scala-spark-master/io/delta/connect/tables/RemoteSparkSession.scala
@@ -97,10 +97,7 @@ trait RemoteSparkSession extends BeforeAndAfterAll { self: Suite =>
   override def beforeAll(): Unit = {
     super.beforeAll()
     server
-    // TODO: Instead of sleeping for a fixed time, which is a bit brittle,
-    // we should repeatedly check when the server is ready.
-    Thread.sleep(10000)
-    spark = SparkSession.builder().remote(s"sc://localhost:$serverPort").build()
+    spark = SparkSession.builder().remote(s"sc://localhost:$serverPort").create()
   }
 
   override def afterAll(): Unit = {