diff --git a/testing/trino-tests/pom.xml b/testing/trino-tests/pom.xml
index 3d58172bd50e..baab8ee09285 100644
--- a/testing/trino-tests/pom.xml
+++ b/testing/trino-tests/pom.xml
@@ -301,6 +301,12 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>org.openjdk.jmh</groupId>
             <artifactId>jmh-core</artifactId>
@@ -327,11 +333,11 @@
                 <artifactId>maven-surefire-plugin</artifactId>
                 <dependencies>
                     <!-- allow both JUnit and TestNG -->
-                    <!--                    <dependency>-->
-                    <!--                        <groupId>org.apache.maven.surefire</groupId>-->
-                    <!--                        <artifactId>surefire-junit-platform</artifactId>-->
-                    <!--                        <version>${dep.plugin.surefire.version}</version>-->
-                    <!--                    </dependency>-->
+                    <dependency>
+                        <groupId>org.apache.maven.surefire</groupId>
+                        <artifactId>surefire-junit-platform</artifactId>
+                        <version>${dep.plugin.surefire.version}</version>
+                    </dependency>
                     <dependency>
                         <groupId>org.apache.maven.surefire</groupId>
                         <artifactId>surefire-testng</artifactId>
diff --git a/testing/trino-tests/src/test/java/io/trino/execution/TestExecutionJmxMetrics.java b/testing/trino-tests/src/test/java/io/trino/execution/TestExecutionJmxMetrics.java
index 7a9cf391c1f7..d4943f4340c7 100644
--- a/testing/trino-tests/src/test/java/io/trino/execution/TestExecutionJmxMetrics.java
+++ b/testing/trino-tests/src/test/java/io/trino/execution/TestExecutionJmxMetrics.java
@@ -17,7 +17,6 @@
 import io.trino.Session;
 import io.trino.execution.resourcegroups.InternalResourceGroupManager;
 import io.trino.plugin.resourcegroups.ResourceGroupManagerPlugin;
-import io.trino.server.PrefixObjectNameGeneratorModule;
 import io.trino.spi.QueryId;
 import io.trino.testing.DistributedQueryRunner;
 import io.trino.tests.tpch.TpchQueryRunnerBuilder;
@@ -45,9 +44,7 @@ public class TestExecutionJmxMetrics
     public void testQueryStats()
             throws Exception
     {
-        try (DistributedQueryRunner queryRunner = TpchQueryRunnerBuilder.builder()
-                .setAdditionalModule(new PrefixObjectNameGeneratorModule("io.trino"))
-                .build()) {
+        try (DistributedQueryRunner queryRunner = TpchQueryRunnerBuilder.builder().build()) {
             queryRunner.installPlugin(new ResourceGroupManagerPlugin());
             InternalResourceGroupManager<?> resourceGroupManager = queryRunner.getCoordinator().getResourceGroupManager()
                     .orElseThrow(() -> new IllegalStateException("Resource manager not configured"));
diff --git a/testing/trino-tests/src/test/java/io/trino/execution/TestRefreshMaterializedView.java b/testing/trino-tests/src/test/java/io/trino/execution/TestRefreshMaterializedView.java
index 3d26bf9bf5af..423f58b13101 100644
--- a/testing/trino-tests/src/test/java/io/trino/execution/TestRefreshMaterializedView.java
+++ b/testing/trino-tests/src/test/java/io/trino/execution/TestRefreshMaterializedView.java
@@ -37,6 +37,7 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInstance;
 import org.junit.jupiter.api.Timeout;
+import org.junit.jupiter.api.parallel.Execution;
 
 import java.time.Duration;
 import java.util.Optional;
@@ -54,8 +55,10 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
+import static org.junit.jupiter.api.parallel.ExecutionMode.SAME_THREAD;
 
 @TestInstance(PER_CLASS)
+@Execution(SAME_THREAD)
 public class TestRefreshMaterializedView
         extends AbstractTestQueryFramework
 {
diff --git a/testing/trino-tests/src/test/java/io/trino/tests/TestQueryPlanDeterminism.java b/testing/trino-tests/src/test/java/io/trino/tests/TestQueryPlanDeterminism.java
index 9a6bd296c921..488696ac7ac6 100644
--- a/testing/trino-tests/src/test/java/io/trino/tests/TestQueryPlanDeterminism.java
+++ b/testing/trino-tests/src/test/java/io/trino/tests/TestQueryPlanDeterminism.java
@@ -34,6 +34,7 @@
 
 import static io.trino.plugin.tpch.TpchMetadata.TINY_SCHEMA_NAME;
 import static io.trino.testing.TestingSession.testSessionBuilder;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 
 @TestInstance(PER_CLASS)
@@ -274,4 +275,13 @@ public void testLargeIn()
         // testLargeIn is expensive
         Assumptions.abort("Skipping testLargeIn");
     }
+
+    @Test
+    @Override
+    public void testUnionAllAboveBroadcastJoin()
+    {
+        // TODO: https://github.com/trinodb/trino/issues/20043
+        assertThatThrownBy(super::testUnionAllAboveBroadcastJoin)
+                .hasMessageContaining("bytes is negative");
+    }
 }
diff --git a/testing/trino-tests/src/test/java/io/trino/tests/TestQuerySpillLimits.java b/testing/trino-tests/src/test/java/io/trino/tests/TestQuerySpillLimits.java
index 9fb634752fa4..f13db591fc16 100644
--- a/testing/trino-tests/src/test/java/io/trino/tests/TestQuerySpillLimits.java
+++ b/testing/trino-tests/src/test/java/io/trino/tests/TestQuerySpillLimits.java
@@ -73,7 +73,7 @@ public void testMaxSpillPerNodeLimit()
             }
         })
                 .isInstanceOf(RuntimeException.class)
-                .hasMessage(".*Query exceeded local spill limit of 10B");
+                .hasMessage("Query exceeded local spill limit of 10B");
     }
 
     @Test
@@ -86,7 +86,7 @@ public void testQueryMaxSpillPerNodeLimit()
             }
         })
                 .isInstanceOf(RuntimeException.class)
-                .hasMessageMatching(".*Query exceeded per-query local spill limit of 10B");
+                .hasMessageMatching("Query exceeded per-query local spill limit of 10B");
     }
 
     private LocalQueryRunner createLocalQueryRunner(NodeSpillConfig nodeSpillConfig)
diff --git a/testing/trino-tests/src/test/java/io/trino/tests/TestServer.java b/testing/trino-tests/src/test/java/io/trino/tests/TestServer.java
index e0dbbb86d8be..526bd17c261e 100644
--- a/testing/trino-tests/src/test/java/io/trino/tests/TestServer.java
+++ b/testing/trino-tests/src/test/java/io/trino/tests/TestServer.java
@@ -37,6 +37,8 @@
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.api.parallel.Execution;
 
 import java.net.URI;
 import java.util.Collections;
@@ -82,7 +84,11 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.assertj.core.api.Fail.fail;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
+import static org.junit.jupiter.api.parallel.ExecutionMode.CONCURRENT;
 
+@TestInstance(PER_CLASS)
+@Execution(CONCURRENT)
 public class TestServer
 {
     private static final JsonCodec<QueryResults> QUERY_RESULTS_CODEC = jsonCodec(QueryResults.class);