diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/job/config/AnalysisConfig.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/job/config/AnalysisConfig.java
index 135ad755359e6..9068ffda4de55 100644
--- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/job/config/AnalysisConfig.java
+++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/job/config/AnalysisConfig.java
@@ -162,9 +162,8 @@ public AnalysisConfig(StreamInput in) throws IOException {
         }
 
         // BWC for removed per-partition normalization
-        // Version check is temporarily against the latest to satisfy CI tests
-        // TODO change to V_6_5_0 after successful backport to 6.x
-        if (in.getVersion().before(Version.V_7_0_0_alpha1)) {
+        // TODO Remove in 7.0.0
+        if (in.getVersion().before(Version.V_6_5_0)) {
             in.readBoolean();
         }
     }
@@ -197,9 +196,8 @@ public void writeTo(StreamOutput out) throws IOException {
         }
 
         // BWC for removed per-partition normalization
-        // Version check is temporarily against the latest to satisfy CI tests
-        // TODO change to V_6_5_0 after successful backport to 6.x
-        if (out.getVersion().before(Version.V_7_0_0_alpha1)) {
+        // TODO Remove in 7.0.0
+        if (out.getVersion().before(Version.V_6_5_0)) {
             out.writeBoolean(false);
         }
     }
diff --git a/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/mixed_cluster/30_ml_jobs_crud.yml b/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/mixed_cluster/30_ml_jobs_crud.yml
index cb036b9d13a26..ba0f4d5091e0f 100644
--- a/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/mixed_cluster/30_ml_jobs_crud.yml
+++ b/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/mixed_cluster/30_ml_jobs_crud.yml
@@ -1,9 +1,3 @@
----
-setup:
-    - skip:
-        version: "all"
-        reason: "Temporarily disabled while backporting https://github.com/elastic/elasticsearch/pull/32816"
-
 ---
 "Test get old cluster job":
   - do:
diff --git a/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/mixed_cluster/40_ml_datafeed_crud.yml b/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/mixed_cluster/40_ml_datafeed_crud.yml
index 529e9e497cafe..0ec288f90973c 100644
--- a/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/mixed_cluster/40_ml_datafeed_crud.yml
+++ b/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/mixed_cluster/40_ml_datafeed_crud.yml
@@ -1,9 +1,3 @@
----
-setup:
-    - skip:
-        version: "all"
-        reason: "Temporarily disabled while backporting https://github.com/elastic/elasticsearch/pull/32816"
-
 ---
 "Test old cluster datafeed":
   - do:
diff --git a/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/old_cluster/30_ml_jobs_crud.yml b/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/old_cluster/30_ml_jobs_crud.yml
index 061a242a78d30..3a3334f6907e9 100644
--- a/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/old_cluster/30_ml_jobs_crud.yml
+++ b/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/old_cluster/30_ml_jobs_crud.yml
@@ -1,9 +1,3 @@
----
-setup:
-    - skip:
-        version: "all"
-        reason: "Temporarily disabled while backporting https://github.com/elastic/elasticsearch/pull/32816"
-
 ---
 "Put job on the old cluster and post some data":
 
diff --git a/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/old_cluster/40_ml_datafeed_crud.yml b/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/old_cluster/40_ml_datafeed_crud.yml
index b8cfcbcda4b1b..c1317bdf3d660 100644
--- a/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/old_cluster/40_ml_datafeed_crud.yml
+++ b/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/old_cluster/40_ml_datafeed_crud.yml
@@ -1,9 +1,3 @@
----
-setup:
-    - skip:
-        version: "all"
-        reason: "Temporarily disabled while backporting https://github.com/elastic/elasticsearch/pull/32816"
-
 ---
 "Put job and datafeed in old cluster":
 
diff --git a/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/upgraded_cluster/30_ml_jobs_crud.yml b/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/upgraded_cluster/30_ml_jobs_crud.yml
index 1da16e79cbe61..bb47524b41d87 100644
--- a/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/upgraded_cluster/30_ml_jobs_crud.yml
+++ b/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/upgraded_cluster/30_ml_jobs_crud.yml
@@ -1,8 +1,4 @@
 setup:
- - skip:
-     version: "all"
-     reason: "Temporarily disabled while backporting https://github.com/elastic/elasticsearch/pull/32816"
-
  - do:
      cluster.health:
         wait_for_status: green
diff --git a/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/upgraded_cluster/40_ml_datafeed_crud.yml b/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/upgraded_cluster/40_ml_datafeed_crud.yml
index 13e7289457a1b..6b4c963dd533b 100644
--- a/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/upgraded_cluster/40_ml_datafeed_crud.yml
+++ b/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/upgraded_cluster/40_ml_datafeed_crud.yml
@@ -1,8 +1,4 @@
 setup:
-  - skip:
-      version: "all"
-      reason: "Temporarily disabled while backporting https://github.com/elastic/elasticsearch/pull/32816"
-
   - do:
      cluster.health:
         wait_for_status: green