diff --git a/lib/trino-collect/src/test/java/io/trino/collect/cache/TestEmptyCache.java b/lib/trino-collect/src/test/java/io/trino/collect/cache/TestEmptyCache.java
index 22d273769b7c..e0943000af0b 100644
--- a/lib/trino-collect/src/test/java/io/trino/collect/cache/TestEmptyCache.java
+++ b/lib/trino-collect/src/test/java/io/trino/collect/cache/TestEmptyCache.java
@@ -28,6 +28,7 @@
 import static java.util.concurrent.Executors.newFixedThreadPool;
 import static java.util.concurrent.TimeUnit.SECONDS;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.testng.Assert.assertTrue;
 
 public class TestEmptyCache
 {
@@ -80,7 +81,7 @@ public void testLoadFailure()
         }
         finally {
             executor.shutdownNow();
-            executor.awaitTermination(10, SECONDS);
+            assertTrue(executor.awaitTermination(10, SECONDS));
         }
     }
 }
diff --git a/lib/trino-collect/src/test/java/io/trino/collect/cache/TestEvictableCache.java b/lib/trino-collect/src/test/java/io/trino/collect/cache/TestEvictableCache.java
index 4274eb453966..b2f06ff38fea 100644
--- a/lib/trino-collect/src/test/java/io/trino/collect/cache/TestEvictableCache.java
+++ b/lib/trino-collect/src/test/java/io/trino/collect/cache/TestEvictableCache.java
@@ -343,7 +343,7 @@ public void testLoadFailure()
         }
         finally {
             executor.shutdownNow();
-            executor.awaitTermination(10, SECONDS);
+            assertTrue(executor.awaitTermination(10, SECONDS));
         }
     }
 
@@ -407,7 +407,7 @@ public void testConcurrentGetWithCallableShareLoad()
         }
         finally {
             executor.shutdownNow();
-            executor.awaitTermination(10, SECONDS);
+            assertTrue(executor.awaitTermination(10, SECONDS));
         }
     }
 
@@ -473,7 +473,7 @@ public void testInvalidateOngoingLoad(Invalidation invalidation)
         }
         finally {
             executor.shutdownNow();
-            executor.awaitTermination(10, SECONDS);
+            assertTrue(executor.awaitTermination(10, SECONDS));
         }
     }
 
@@ -543,7 +543,7 @@ public void testInvalidateAndLoadConcurrently(Invalidation invalidation)
         }
         finally {
             executor.shutdownNow();
-            executor.awaitTermination(10, SECONDS);
+            assertTrue(executor.awaitTermination(10, SECONDS));
         }
     }
 
diff --git a/lib/trino-collect/src/test/java/io/trino/collect/cache/TestEvictableLoadingCache.java b/lib/trino-collect/src/test/java/io/trino/collect/cache/TestEvictableLoadingCache.java
index 0259538a100b..424416479d61 100644
--- a/lib/trino-collect/src/test/java/io/trino/collect/cache/TestEvictableLoadingCache.java
+++ b/lib/trino-collect/src/test/java/io/trino/collect/cache/TestEvictableLoadingCache.java
@@ -466,7 +466,7 @@ public void testConcurrentGetWithCallableShareLoad()
         }
         finally {
             executor.shutdownNow();
-            executor.awaitTermination(10, SECONDS);
+            assertTrue(executor.awaitTermination(10, SECONDS));
         }
     }
 
@@ -521,7 +521,7 @@ public Integer load(Integer key)
         }
         finally {
             executor.shutdownNow();
-            executor.awaitTermination(10, SECONDS);
+            assertTrue(executor.awaitTermination(10, SECONDS));
         }
     }
 
@@ -599,7 +599,7 @@ public String load(Integer key)
         }
         finally {
             executor.shutdownNow();
-            executor.awaitTermination(10, SECONDS);
+            assertTrue(executor.awaitTermination(10, SECONDS));
         }
     }
 
@@ -672,7 +672,7 @@ public void testInvalidateAndLoadConcurrently(Invalidation invalidation)
         }
         finally {
             executor.shutdownNow();
-            executor.awaitTermination(10, SECONDS);
+            assertTrue(executor.awaitTermination(10, SECONDS));
         }
     }
 
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/cache/TestCachingHiveMetastore.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/cache/TestCachingHiveMetastore.java
index f78d0aba4b4a..841648ab13b5 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/cache/TestCachingHiveMetastore.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/cache/TestCachingHiveMetastore.java
@@ -1046,7 +1046,7 @@ public Map<String, Optional<Partition>> getPartitionsByNames(Table table, List<S
             getPartitionsByNamesFinishedLatch.countDown();
 
             executor.shutdownNow();
-            executor.awaitTermination(10, SECONDS);
+            assertTrue(executor.awaitTermination(10, SECONDS));
         }
     }
 
diff --git a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/BaseIcebergConnectorSmokeTest.java b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/BaseIcebergConnectorSmokeTest.java
index 584d2d42b645..2d1eff619a96 100644
--- a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/BaseIcebergConnectorSmokeTest.java
+++ b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/BaseIcebergConnectorSmokeTest.java
@@ -144,7 +144,7 @@ public void testDeleteRowsConcurrently()
         }
         finally {
             executor.shutdownNow();
-            executor.awaitTermination(10, SECONDS);
+            assertTrue(executor.awaitTermination(10, SECONDS));
         }
     }
 
diff --git a/testing/trino-testing/src/main/java/io/trino/testing/BaseConnectorTest.java b/testing/trino-testing/src/main/java/io/trino/testing/BaseConnectorTest.java
index 5a93bfed0596..1faaeffa419c 100644
--- a/testing/trino-testing/src/main/java/io/trino/testing/BaseConnectorTest.java
+++ b/testing/trino-testing/src/main/java/io/trino/testing/BaseConnectorTest.java
@@ -69,6 +69,7 @@
 import java.util.concurrent.ExecutorCompletionService;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Future;
+import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Consumer;
@@ -1947,7 +1948,8 @@ protected void testReadMetadataWithRelationsConcurrentModifications(int readIter
         writeTasksCount = 2 * writeTasksCount; // writes are scheduled twice
         CountDownLatch writeTasksInitialized = new CountDownLatch(writeTasksCount);
         Runnable writeInitialized = writeTasksInitialized::countDown;
-        Supplier<Boolean> done = () -> incompleteReadTasks.get() == 0;
+        AtomicBoolean aborted = new AtomicBoolean();
+        Supplier<Boolean> done = () -> aborted.get() || incompleteReadTasks.get() == 0;
         List<Callable<Void>> writeTasks = new ArrayList<>();
         writeTasks.add(createDropRepeatedly(writeInitialized, done, "concur_table", createTableSqlTemplateForConcurrentModifications(), "DROP TABLE %s"));
         if (hasBehavior(SUPPORTS_CREATE_VIEW)) {
@@ -1978,6 +1980,14 @@ protected void testReadMetadataWithRelationsConcurrentModifications(int readIter
                 future.get(); // non-blocking
             }
         }
+        catch (Throwable failure) {
+            aborted.set(true);
+            executor.shutdownNow();
+            if (!executor.awaitTermination(10, SECONDS)) {
+                throw new AssertionError("Test threads did not complete. Leaving test threads behind may violate AbstractTestQueryFramework.checkQueryInfosFinal", failure);
+            }
+            throw failure;
+        }
         finally {
             executor.shutdownNow();
         }