6 files changed, 5 insertions, 19 deletions
diff --git a/jstests/sharding/move_primary_basic.js b/jstests/sharding/move_primary_basic.js
index 12ccdf7b2ed..5dc2216b4dd 100644
--- a/jstests/sharding/move_primary_basic.js
+++ b/jstests/sharding/move_primary_basic.js
@@ -107,7 +107,7 @@ jsTest.log('Test that only unsharded collections are moved');
 }
 
 // TODO (SERVER-71309): Remove once 7.0 becomes last LTS.
-if (FeatureFlagUtil.isEnabled(config.admin, 'ResilientMovePrimary')) {
+if (FeatureFlagUtil.isPresentAndEnabled(config.admin, 'ResilientMovePrimary')) {
     jsTest.log('Test that orphaned documents on recipient causes the operation to fail');
 
     // Insert an orphaned document on shard1.
diff --git a/jstests/sharding/move_primary_clone.js b/jstests/sharding/move_primary_clone.js
index a2ccc7eabac..5f6d75f1abd 100644
--- a/jstests/sharding/move_primary_clone.js
+++ b/jstests/sharding/move_primary_clone.js
@@ -193,7 +193,7 @@ function movePrimaryWithFailpoint(sharded) {
                                      ErrorCodes.InvalidOptions);
     } else {
         // TODO (SERVER-71309): Remove once 7.0 becomes last LTS.
-        if (!FeatureFlagUtil.isEnabled(db, 'ResilientMovePrimary')) {
+        if (!FeatureFlagUtil.isPresentAndEnabled(db, 'ResilientMovePrimary')) {
             // If the collections are unsharded, we should fail when any collections being copied
             // exist on the target shard.
             assert.commandFailed(st.s0.adminCommand({movePrimary: "test1", to: toShard.name}));
diff --git a/jstests/sharding/move_primary_with_writes.js b/jstests/sharding/move_primary_with_writes.js
index a4b168b5338..86aef4084b7 100644
--- a/jstests/sharding/move_primary_with_writes.js
+++ b/jstests/sharding/move_primary_with_writes.js
@@ -289,7 +289,8 @@ st.forEachConnection(shard => {
 let cloningDataFPName = "hangBeforeCloningData";
 
 // TODO (SERVER-71309): Remove once 7.0 becomes last LTS.
-if (!FeatureFlagUtil.isEnabled(st.configRS.getPrimary().getDB('admin'), "ResilientMovePrimary")) {
+if (!FeatureFlagUtil.isPresentAndEnabled(st.configRS.getPrimary().getDB('admin'),
+                                         "ResilientMovePrimary")) {
     cloningDataFPName = "hangInCloneStage";
 }
 
diff --git a/jstests/sharding/timeseries_multiple_mongos.js b/jstests/sharding/timeseries_multiple_mongos.js
index e5d75cdc384..af8e154baf1 100644
--- a/jstests/sharding/timeseries_multiple_mongos.js
+++ b/jstests/sharding/timeseries_multiple_mongos.js
@@ -290,8 +290,7 @@ runTest({
     numProfilerEntries: {sharded: 1, unsharded: 1},
 });
 
-if (TimeseriesTest.timeseriesUpdatesAndDeletesEnabled(st.shard0) &&
-    TimeseriesTest.shardedTimeseriesUpdatesAndDeletesEnabled(st.shard0)) {
+if (TimeseriesTest.shardedTimeseriesUpdatesAndDeletesEnabled(st.shard0)) {
     // Tests for updates.
     runTest({
         shardKey: {[metaField + ".a"]: 1},
diff --git a/jstests/sharding/timeseries_update.js b/jstests/sharding/timeseries_update.js
index 96531a09c56..7846fdaf159 100644
--- a/jstests/sharding/timeseries_update.js
+++ b/jstests/sharding/timeseries_update.js
@@ -35,13 +35,6 @@ if (!TimeseriesTest.shardedtimeseriesCollectionsEnabled(st.shard0)) {
     return;
 }
 
-if (!TimeseriesTest.timeseriesUpdatesAndDeletesEnabled(st.shard0)) {
-    jsTestLog(
-        "Skipping test because the updates and deletes on time-series collection feature flag is disabled");
-    st.stop();
-    return;
-}
-
 const testDB = mongos.getDB(dbName);
 testDB.dropDatabase();
 assert.commandWorked(mongos.adminCommand({enableSharding: dbName}));
diff --git a/jstests/sharding/timeseries_update_routing.js b/jstests/sharding/timeseries_update_routing.js
index 384882f983a..d2a838c1831 100644
--- a/jstests/sharding/timeseries_update_routing.js
+++ b/jstests/sharding/timeseries_update_routing.js
@@ -33,13 +33,6 @@ if (!TimeseriesTest.shardedtimeseriesCollectionsEnabled(st.shard0)) {
     return;
 }
 
-if (!TimeseriesTest.timeseriesUpdatesAndDeletesEnabled(st.shard0)) {
-    jsTestLog(
-        "Skipping test because the updates and deletes on time-series collection feature flag is disabled");
-    st.stop();
-    return;
-}
-
 if (!TimeseriesTest.shardedTimeseriesUpdatesAndDeletesEnabled(st.shard0)) {
     jsTestLog(
         "Skipping test because the updates and deletes on sharded time-series collection feature flag is disabled");