diff --git a/buildSrc/src/main/groovy/org/elasticsearch/gradle/test/NodeInfo.groovy b/buildSrc/src/main/groovy/org/elasticsearch/gradle/test/NodeInfo.groovy
index 0dd56b863324f..aaf4e468182a9 100644
--- a/buildSrc/src/main/groovy/org/elasticsearch/gradle/test/NodeInfo.groovy
+++ b/buildSrc/src/main/groovy/org/elasticsearch/gradle/test/NodeInfo.groovy
@@ -177,6 +177,12 @@ class NodeInfo {
             javaVersion = 8
         } else if (nodeVersion.onOrAfter("6.2.0") && nodeVersion.before("6.3.0")) {
             javaVersion = 9
+        } else if (project.inFipsJvm && nodeVersion.onOrAfter("6.3.0") && nodeVersion.before("6.4.0")) {
+            /*
+             * Elasticsearch versions before 6.4.0 cannot be run in a FIPS-140 JVM. If we're running
+             * bwc tests in a FIPS-140 JVM, ensure that the pre v6.4.0 nodes use a Java 10 JVM instead.
+             */
+            javaVersion = 10
         }
 
         args.addAll("-E", "node.portsfile=true")
diff --git a/x-pack/qa/full-cluster-restart/with-system-key/build.gradle b/x-pack/qa/full-cluster-restart/with-system-key/build.gradle
index 928280b6584bd..e69de29bb2d1d 100644
--- a/x-pack/qa/full-cluster-restart/with-system-key/build.gradle
+++ b/x-pack/qa/full-cluster-restart/with-system-key/build.gradle
@@ -1,8 +0,0 @@
-import org.elasticsearch.gradle.test.RestIntegTestTask
-
-// Skip test on FIPS FIXME https://github.com/elastic/elasticsearch/issues/32737
-if (project.inFipsJvm) {
-    tasks.withType(RestIntegTestTask) {
-        enabled = false
-    }
-}
diff --git a/x-pack/qa/rolling-upgrade/with-system-key/build.gradle b/x-pack/qa/rolling-upgrade/with-system-key/build.gradle
index 5aaa1ed1eff9b..03505e01dedd8 100644
--- a/x-pack/qa/rolling-upgrade/with-system-key/build.gradle
+++ b/x-pack/qa/rolling-upgrade/with-system-key/build.gradle
@@ -1,10 +1 @@
-import org.elasticsearch.gradle.test.RestIntegTestTask
-
-// Skip test on FIPS FIXME https://github.com/elastic/elasticsearch/issues/32737
-if (project.inFipsJvm) {
-    tasks.withType(RestIntegTestTask) {
-        enabled = false
-    }
-}
-
 group = "${group}.x-pack.qa.rolling-upgrade.with-system-key"