diff --git a/qa/rolling-upgrade/build.gradle b/qa/rolling-upgrade/build.gradle
index 7410366ab14..720bbf5138f 100644
--- a/qa/rolling-upgrade/build.gradle
+++ b/qa/rolling-upgrade/build.gradle
@@ -209,14 +209,18 @@ subprojects {
       dependsOn = [upgradedClusterTest]
     }
 
-    bwcTest.dependsOn(versionBwcTest)
+    if (project.bwc_tests_enabled) {
+      bwcTest.dependsOn(versionBwcTest)
+    }
   }
 
   test.enabled = false // no unit tests for rolling upgrades, only the rest integration test
 
   // basic integ tests includes testing bwc against the most recent version
   task integTest {
-    dependsOn = ["v${wireCompatVersions[-1]}#bwcTest"]
+    if (project.bwc_tests_enabled) {
+      dependsOn = ["v${wireCompatVersions[-1]}#bwcTest"]
+    }
   }
   check.dependsOn(integTest)