diff --git a/src/it/java/org/eclipse/microprofile/starter/TestMatrixTest.java b/src/it/java/org/eclipse/microprofile/starter/TestMatrixTest.java
index 95f8cdfa..ff49885d 100644
--- a/src/it/java/org/eclipse/microprofile/starter/TestMatrixTest.java
+++ b/src/it/java/org/eclipse/microprofile/starter/TestMatrixTest.java
@@ -100,9 +100,9 @@ public void testRuntime(String supportedServer, String artifactId, SpecSelection
         File buildLogB = null;
         File runLogA = null;
         File runLogB = null;
-        
-        // Workaround https://github.com/OpenLiberty/ci.gradle/issues/841
-        final int threadPoolSize = supportedServer.equalsIgnoreCase("LIBERTY") ? 1 : 2;
+
+        // Workaround https://github.com/OpenLiberty/ci.gradle/issues/841 by using a single-thread for Liberty + Gradle
+        int threadPoolSize = (supportedServer.equalsIgnoreCase("LIBERTY") && buildTool.equals(BuildTool.GRADLE)) ? 1 : 2;
 
         try {
             // Cleanup