diff --git a/src/test/groovy/graphql/ChainedDataLoaderTest.groovy b/src/test/groovy/graphql/ChainedDataLoaderTest.groovy
index 391f184a73..a2f78c9461 100644
--- a/src/test/groovy/graphql/ChainedDataLoaderTest.groovy
+++ b/src/test/groovy/graphql/ChainedDataLoaderTest.groovy
@@ -9,8 +9,8 @@ import org.dataloader.BatchLoader
 import org.dataloader.DataLoader
 import org.dataloader.DataLoaderFactory
 import org.dataloader.DataLoaderRegistry
+import spock.lang.RepeatUntilFailure
 import spock.lang.Specification
-import spock.lang.Unroll
 
 import java.time.Duration
 import java.util.concurrent.Executors
@@ -86,7 +86,7 @@ class ChainedDataLoaderTest extends Specification {
         batchLoadCalls == 2
     }
 
-    @Unroll
+    @RepeatUntilFailure(maxAttempts = 20, ignoreRest = false)
     def "parallel different data loaders"() {
         given:
         def sdl = '''
@@ -177,8 +177,6 @@ class ChainedDataLoaderTest extends Specification {
         er.data == [hello: "friendsLunakey1Skipperkey2", helloDelayed: "friendsLunakey1-delayedSkipperkey2-delayed"]
         batchLoadCalls.get() == 6
 
-        where:
-        i << (0..20)
     }
 
 
@@ -339,7 +337,7 @@ class ChainedDataLoaderTest extends Specification {
         batchLoadCalls == 3
     }
 
-    def "chained data loaders with two isolated data loaders"() {
+    def "chained data loaders with two delayed data loaders"() {
         given:
         def sdl = '''
 
diff --git a/src/test/groovy/graphql/GraphqlErrorHelperTest.groovy b/src/test/groovy/graphql/GraphqlErrorHelperTest.groovy
index 0736b1671a..a0c4c4e9e3 100644
--- a/src/test/groovy/graphql/GraphqlErrorHelperTest.groovy
+++ b/src/test/groovy/graphql/GraphqlErrorHelperTest.groovy
@@ -156,7 +156,7 @@ class GraphqlErrorHelperTest extends Specification {
         }
     }
 
-    @RepeatUntilFailure(maxAttempts = 1_000)
+    @RepeatUntilFailure(maxAttempts = 1_000, ignoreRest = false)
     def "can deterministically serialize SourceLocation"() {
         when:
         def specMap = GraphqlErrorHelper.toSpecification(new TestError())
diff --git a/src/test/groovy/graphql/execution/instrumentation/dataloader/DeferWithDataLoaderTest.groovy b/src/test/groovy/graphql/execution/instrumentation/dataloader/DeferWithDataLoaderTest.groovy
index 2978d31c91..9160b3cb0b 100644
--- a/src/test/groovy/graphql/execution/instrumentation/dataloader/DeferWithDataLoaderTest.groovy
+++ b/src/test/groovy/graphql/execution/instrumentation/dataloader/DeferWithDataLoaderTest.groovy
@@ -349,7 +349,8 @@ class DeferWithDataLoaderTest extends Specification {
         batchCompareDataFetchers.productsForDepartmentsBatchLoaderCounter.get() == 1
     }
 
-    @RepeatUntilFailure(maxAttempts = 50)
+    @RepeatUntilFailure(maxAttempts = 50, ignoreRest = false)
+    // skip until
     def "dataloader in initial result and chained dataloader inside nested defer block"() {
         given:
         def sdl = '''
diff --git a/src/test/groovy/graphql/execution/instrumentation/dataloader/Issue1178DataLoaderDispatchTest.groovy b/src/test/groovy/graphql/execution/instrumentation/dataloader/Issue1178DataLoaderDispatchTest.groovy
index 300c3e9371..ff0981bfd4 100644
--- a/src/test/groovy/graphql/execution/instrumentation/dataloader/Issue1178DataLoaderDispatchTest.groovy
+++ b/src/test/groovy/graphql/execution/instrumentation/dataloader/Issue1178DataLoaderDispatchTest.groovy
@@ -22,7 +22,7 @@ import static graphql.schema.idl.TypeRuntimeWiring.newTypeWiring
 class Issue1178DataLoaderDispatchTest extends Specification {
 
 
-    @RepeatUntilFailure(maxAttempts = 100)
+    @RepeatUntilFailure(maxAttempts = 100, ignoreRest = false)
     def "shouldn't dispatch twice in multithreaded env"() {
         setup:
         def sdl = """