diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/MultiplexedSessionDatabaseClientMockServerTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/MultiplexedSessionDatabaseClientMockServerTest.java
index 629b5611862..245d42c4f10 100644
--- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/MultiplexedSessionDatabaseClientMockServerTest.java
+++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/MultiplexedSessionDatabaseClientMockServerTest.java
@@ -337,7 +337,9 @@ public void testRetryWithTheDatabaseNotFoundExceptionWithSessionCreationWaitTime
   @Test
   public void testRetryWithNoSessionCreationWaitTime() {
     mockSpanner.setCreateSessionExecutionTime(
-        SimulatedExecutionTime.ofExceptions(
+        SimulatedExecutionTime.ofMinimumAndRandomTimeAndExceptions(
+            100,
+            0,
             Collections.singletonList(
                 Status.DEADLINE_EXCEEDED
                     .withDescription(
diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/it/ITBulkConnectionTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/it/ITBulkConnectionTest.java
index 42358a647a1..8a91502434f 100644
--- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/it/ITBulkConnectionTest.java
+++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/it/ITBulkConnectionTest.java
@@ -80,7 +80,7 @@ public void testBulkCreateConnectionsMultiThreaded() throws InterruptedException
           });
     }
     executor.shutdown();
-    executor.awaitTermination(10L, TimeUnit.SECONDS);
+    assertThat(executor.awaitTermination(60L, TimeUnit.SECONDS), is(true));
     // close Spanner instances explicitly. This method will throw an exception if there are any
     // connections still open in the pool
     closeSpanner();