diff --git a/muted-tests.yml b/muted-tests.yml
index 85ea63928dc69..fe0f9b5e493bd 100644
--- a/muted-tests.yml
+++ b/muted-tests.yml
@@ -444,12 +444,3 @@ tests:
 - class: org.elasticsearch.reservedstate.service.RepositoriesFileSettingsIT
   method: testSettingsApplied
   issue: https://github.com/elastic/elasticsearch/issues/116694
-- class: org.elasticsearch.upgrades.FileSettingsRoleMappingUpgradeIT
-  method: testRoleMappingsAppliedOnUpgrade {upgradedNodes=3}
-  issue: https://github.com/elastic/elasticsearch/issues/118311
-- class: org.elasticsearch.upgrades.FileSettingsRoleMappingUpgradeIT
-  method: testRoleMappingsAppliedOnUpgrade {upgradedNodes=1}
-  issue: https://github.com/elastic/elasticsearch/issues/118309
-- class: org.elasticsearch.upgrades.FileSettingsRoleMappingUpgradeIT
-  method: testRoleMappingsAppliedOnUpgrade {upgradedNodes=2}
-  issue: https://github.com/elastic/elasticsearch/issues/118310
diff --git a/qa/rolling-upgrade/src/javaRestTest/java/org/elasticsearch/upgrades/FileSettingsRoleMappingUpgradeIT.java b/qa/rolling-upgrade/src/javaRestTest/java/org/elasticsearch/upgrades/FileSettingsRoleMappingUpgradeIT.java
index bd291dd14aeb8..d4414f580887a 100644
--- a/qa/rolling-upgrade/src/javaRestTest/java/org/elasticsearch/upgrades/FileSettingsRoleMappingUpgradeIT.java
+++ b/qa/rolling-upgrade/src/javaRestTest/java/org/elasticsearch/upgrades/FileSettingsRoleMappingUpgradeIT.java
@@ -16,8 +16,9 @@
 import org.elasticsearch.test.XContentTestUtils;
 import org.elasticsearch.test.cluster.ElasticsearchCluster;
 import org.elasticsearch.test.cluster.local.distribution.DistributionType;
+import org.elasticsearch.test.cluster.util.Version;
 import org.elasticsearch.test.cluster.util.resource.Resource;
-import org.junit.Before;
+import org.elasticsearch.test.junit.RunnableTestRuleAdapter;
 import org.junit.ClassRule;
 import org.junit.rules.RuleChain;
 import org.junit.rules.TemporaryFolder;
@@ -70,9 +71,15 @@ public String get() {
         .setting("xpack.security.authc.anonymous.roles", "superuser")
         .configFile("operator/settings.json", Resource.fromString(SETTING_JSON))
         .build();
+    private static final RunnableTestRuleAdapter versionLimit = new RunnableTestRuleAdapter(
+        () -> assumeTrue(
+            "Only relevant when upgrading from a version before role mappings were stored in cluster state",
+            getOldClusterTestVersion().after(new Version(8, 7, 0)) && getOldClusterTestVersion().before(new Version(8, 15, 0))
+        )
+    );
 
     @ClassRule
-    public static TestRule ruleChain = RuleChain.outerRule(repoDirectory).around(cluster);
+    public static TestRule ruleChain = RuleChain.outerRule(versionLimit).around(repoDirectory).around(cluster);
 
     public FileSettingsRoleMappingUpgradeIT(@Name("upgradedNodes") int upgradedNodes) {
         super(upgradedNodes);
@@ -83,14 +90,6 @@ protected ElasticsearchCluster getUpgradeCluster() {
         return cluster;
     }
 
-    @Before
-    public void checkVersions() {
-        assumeTrue(
-            "Only relevant when upgrading from a version before role mappings were stored in cluster state",
-            oldClusterHasFeature("gte_v8.7.0") && oldClusterHasFeature("gte_v8.15.0") == false
-        );
-    }
-
     private static void waitForSecurityMigrationCompletionIfIndexExists() throws Exception {
         final Request request = new Request("GET", "_cluster/state/metadata/.security-7");
         assertBusy(() -> {