diff --git a/.jenkins/Jenkinsfile b/.jenkins/Jenkinsfile
index 9ed102ac1b..22c540fe47 100644
--- a/.jenkins/Jenkinsfile
+++ b/.jenkins/Jenkinsfile
@@ -54,12 +54,13 @@ pipeline {
           steps {
             script {
               def attempt = 1
-              retry(2) {
+              while (attempt <=2) {
                 if (attempt > 1) {
                   sleep(60 * attempt)
                 }
                 attempt = attempt + 1
                 stress = build job: "${env.JOB_NAME}-stress-test", propagate: false
+                if (stress.result != 'FAILURE') break
               }
               if (stress.result != 'SUCCESS') unstable('stress test failures')
               if (stress.result == 'FAILURE') currentBuild.result='FAILURE'
@@ -79,12 +80,13 @@ pipeline {
           steps {
               script {
                 def attempt = 1
-                retry(2) {
+                while (attempt <=2) {
                   if (attempt > 1) {
                     sleep(60 * attempt)
                   }
                   attempt = attempt + 1
                   fqltool = build job: "${env.JOB_NAME}-fqltool-test", propagate: false
+                  if (fqltool.result != 'FAILURE') break
                 }
                 if (fqltool.result != 'SUCCESS') unstable('fqltool test failures')
                 if (fqltool.result == 'FAILURE') currentBuild.result='FAILURE'
@@ -104,12 +106,13 @@ pipeline {
           steps {
             script {
                 def attempt = 1
-                retry(2) {
+                while (attempt <=2) {
                   if (attempt > 1) {
                     sleep(60 * attempt)
                   }
                   attempt = attempt + 1
                   test = build job: "${env.JOB_NAME}-test", propagate: false
+                  if (test.result != 'FAILURE') break
               }
               if (test.result != 'SUCCESS') unstable('unit test failures')
               if (test.result == 'FAILURE') currentBuild.result='FAILURE'
@@ -129,12 +132,13 @@ pipeline {
           steps {
             script {
                 def attempt = 1
-                retry(2) {
+                while (attempt <=2) {
                   if (attempt > 1) {
                     sleep(60 * attempt)
                   }
                   attempt = attempt + 1
                   long_test = build job: "${env.JOB_NAME}-long-test", propagate: false
+                  if (long_test.result != 'FAILURE') break
               }
               if (long_test.result != 'SUCCESS') unstable('long unit test failures')
               if (long_test.result == 'FAILURE') currentBuild.result='FAILURE'
@@ -154,12 +158,13 @@ pipeline {
           steps {
             script {
                 def attempt = 1
-                retry(2) {
+                while (attempt <=2) {
                   if (attempt > 1) {
                     sleep(60 * attempt)
                   }
                   attempt = attempt + 1
                   burn = build job: "${env.JOB_NAME}-test-burn", propagate: false
+                  if (burn.result != 'FAILURE') break
               }
               if (burn.result != 'SUCCESS') unstable('burn test failures')
               if (burn.result == 'FAILURE') currentBuild.result='FAILURE'
@@ -179,12 +184,13 @@ pipeline {
           steps {
             script {
                 def attempt = 1
-                retry(2) {
+                while (attempt <=2) {
                   if (attempt > 1) {
                     sleep(60 * attempt)
                   }
                   attempt = attempt + 1
                   cdc = build job: "${env.JOB_NAME}-test-cdc", propagate: false
+                  if (cdc.result != 'FAILURE') break
               }
               if (cdc.result != 'SUCCESS') unstable('cdc failures')
               if (cdc.result == 'FAILURE') currentBuild.result='FAILURE'
@@ -204,12 +210,13 @@ pipeline {
           steps {
             script {
                 def attempt = 1
-                retry(2) {
+                while (attempt <=2) {
                   if (attempt > 1) {
                     sleep(60 * attempt)
                   }
                   attempt = attempt + 1
                   compression = build job: "${env.JOB_NAME}-test-compression", propagate: false
+                  if (compression.result != 'FAILURE') break
               }
               if (compression.result != 'SUCCESS') unstable('compression failures')
               if (compression.result == 'FAILURE') currentBuild.result='FAILURE'
@@ -229,12 +236,13 @@ pipeline {
           steps {
             script {
                 def attempt = 1
-                retry(2) {
+                while (attempt <=2) {
                   if (attempt > 1) {
                     sleep(60 * attempt)
                   }
                   attempt = attempt + 1
                   cqlsh = build job: "${env.JOB_NAME}-cqlsh-tests", propagate: false
+                  if (cqlsh.result != 'FAILURE') break
                 }
                 if (cqlsh.result != 'SUCCESS') unstable('cqlsh failures')
                 if (cqlsh.result == 'FAILURE') currentBuild.result='FAILURE'
@@ -258,12 +266,13 @@ pipeline {
             steps {
               script {
                   def attempt = 1
-                  retry(2) {
+                  while (attempt <=2) {
                     if (attempt > 1) {
                       sleep(60 * attempt)
                     }
                     attempt = attempt + 1
                     jvm_dtest = build job: "${env.JOB_NAME}-jvm-dtest", propagate: false
+                    if (jvm_dtest.result != 'FAILURE') break
                   }
                   if (jvm_dtest.result != 'SUCCESS') unstable('jvm-dtest failures')
                   if (jvm_dtest.result == 'FAILURE') currentBuild.result='FAILURE'
@@ -283,12 +292,13 @@ pipeline {
             steps {
               script {
                   def attempt = 1
-                  retry(2) {
+                  while (attempt <=2) {
                     if (attempt > 1) {
                       sleep(60 * attempt)
                     }
                     attempt = attempt + 1
                     jvm_dtest_upgrade = build job: "${env.JOB_NAME}-jvm-dtest-upgrade", propagate: false
+                    if (jvm_dtest_upgrade.result != 'FAILURE') break
                 }
                 if (jvm_dtest_upgrade.result != 'SUCCESS') unstable('jvm-dtest-upgrade failures')
                 if (jvm_dtest_upgrade.result == 'FAILURE') currentBuild.result='FAILURE'
@@ -308,12 +318,13 @@ pipeline {
             steps {
               script {
                   def attempt = 1
-                  retry(2) {
+                  while (attempt <=2) {
                     if (attempt > 1) {
                       sleep(60 * attempt)
                     }
                     attempt = attempt + 1
                     dtest = build job: "${env.JOB_NAME}-dtest", propagate: false
+                    if (dtest.result != 'FAILURE') break
                 }
                 if (dtest.result != 'SUCCESS') unstable('dtest failures')
                 if (dtest.result == 'FAILURE') currentBuild.result='FAILURE'
@@ -333,12 +344,13 @@ pipeline {
             steps {
               script {
                   def attempt = 1
-                  retry(2) {
+                  while (attempt <=2) {
                     if (attempt > 1) {
                       sleep(60 * attempt)
                     }
                     attempt = attempt + 1
                     dtest_large = build job: "${env.JOB_NAME}-dtest-large", propagate: false
+                    if (dtest_large.result != 'FAILURE') break
                 }
                 if (dtest_large.result != 'SUCCESS') unstable('dtest-large failures')
                 if (dtest_large.result == 'FAILURE') currentBuild.result='FAILURE'
@@ -358,12 +370,13 @@ pipeline {
             steps {
               script {
                   def attempt = 1
-                  retry(2) {
+                  while (attempt <=2) {
                     if (attempt > 1) {
                       sleep(60 * attempt)
                     }
                     attempt = attempt + 1
                     dtest_novnode = build job: "${env.JOB_NAME}-dtest-novnode", propagate: false
+                    if (dtest_novnode.result != 'FAILURE') break
                 }
                 if (dtest_novnode.result != 'SUCCESS') unstable('dtest-novnode failures')
                 if (dtest_novnode.result == 'FAILURE') currentBuild.result='FAILURE'
@@ -383,12 +396,13 @@ pipeline {
             steps {
               script {
                   def attempt = 1
-                  retry(2) {
+                  while (attempt <=2) {
                     if (attempt > 1) {
                       sleep(60 * attempt)
                     }
                     attempt = attempt + 1
                     dtest_offheap = build job: "${env.JOB_NAME}-dtest-offheap", propagate: false
+                    if (dtest_offheap.result != 'FAILURE') break
                 }
                 if (dtest_offheap.result != 'SUCCESS') unstable('dtest-offheap failures')
                 if (dtest_offheap.result == 'FAILURE') currentBuild.result='FAILURE'
@@ -408,12 +422,13 @@ pipeline {
             steps {
               script {
                   def attempt = 1
-                  retry(2) {
+                  while (attempt <=2) {
                     if (attempt > 1) {
                       sleep(60 * attempt)
                     }
                     attempt = attempt + 1
                     dtest_large_novnode = build job: "${env.JOB_NAME}-dtest-large-novnode", propagate: false
+                    if (dtest_large_novnode.result != 'FAILURE') break
                 }
                 if (dtest_large_novnode.result != 'SUCCESS') unstable('dtest-large-novnode failures')
                 if (dtest_large_novnode.result == 'FAILURE') currentBuild.result='FAILURE'
@@ -433,12 +448,13 @@ pipeline {
             steps {
               script {
                   def attempt = 1
-                  retry(2) {
+                  while (attempt <=2) {
                     if (attempt > 1) {
                       sleep(60 * attempt)
                     }
                     attempt = attempt + 1
                     dtest_upgrade = build job: "${env.JOB_NAME}-dtest-upgrade", propagate: false
+                    if (dtest_upgrade.result != 'FAILURE') break
                 }
                 if (dtest_upgrade.result != 'SUCCESS') unstable('dtest failures')
                 if (dtest_upgrade.result == 'FAILURE') currentBuild.result='FAILURE'