diff --git a/muted-tests.yml b/muted-tests.yml
index fe6625de3b030..13f9884c251f0 100644
--- a/muted-tests.yml
+++ b/muted-tests.yml
@@ -85,8 +85,6 @@ tests:
 - class: org.elasticsearch.xpack.searchablesnapshots.cache.common.CacheFileTests
   method: testCacheFileCreatedAsSparseFile
   issue: https://github.com/elastic/elasticsearch/issues/110801
-- class: org.elasticsearch.upgrades.FileSettingsUpgradeIT
-  issue: https://github.com/elastic/elasticsearch/issues/110884
 - class: "org.elasticsearch.xpack.watcher.test.integration.HistoryIntegrationTests"
   issue: "https://github.com/elastic/elasticsearch/issues/110885"
   method: "testPayloadInputWithDotsInFieldNameWorks"
diff --git a/qa/rolling-upgrade/src/javaRestTest/java/org/elasticsearch/upgrades/FileSettingsUpgradeIT.java b/qa/rolling-upgrade/src/javaRestTest/java/org/elasticsearch/upgrades/FileSettingsUpgradeIT.java
index c80911fe5fbcf..8ffaec5506f1d 100644
--- a/qa/rolling-upgrade/src/javaRestTest/java/org/elasticsearch/upgrades/FileSettingsUpgradeIT.java
+++ b/qa/rolling-upgrade/src/javaRestTest/java/org/elasticsearch/upgrades/FileSettingsUpgradeIT.java
@@ -15,11 +15,10 @@
 import org.elasticsearch.core.SuppressForbidden;
 import org.elasticsearch.test.cluster.ElasticsearchCluster;
 import org.elasticsearch.test.cluster.FeatureFlag;
-import org.elasticsearch.test.cluster.local.DefaultLocalClusterSpecBuilder;
 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.BeforeClass;
+import org.elasticsearch.test.junit.RunnableTestRuleAdapter;
 import org.junit.ClassRule;
 import org.junit.rules.RuleChain;
 import org.junit.rules.TemporaryFolder;
@@ -33,10 +32,9 @@
 
 public class FileSettingsUpgradeIT extends ParameterizedRollingUpgradeTestCase {
 
-    @BeforeClass
-    public static void checkVersion() {
-        assumeTrue("Only valid when upgrading from pre-file settings", getOldClusterTestVersion().before(new Version(8, 4, 0)));
-    }
+    private static final RunnableTestRuleAdapter versionLimit = new RunnableTestRuleAdapter(
+        () -> assumeTrue("Only valid when upgrading from pre-file settings", getOldClusterTestVersion().before(new Version(8, 4, 0)))
+    );
 
     private static final String settingsJSON = """
         {
@@ -53,7 +51,8 @@ public static void checkVersion() {
 
     private static final TemporaryFolder repoDirectory = new TemporaryFolder();
 
-    private static final ElasticsearchCluster cluster = new DefaultLocalClusterSpecBuilder().distribution(DistributionType.DEFAULT)
+    private static final ElasticsearchCluster cluster = ElasticsearchCluster.local()
+        .distribution(DistributionType.DEFAULT)
         .version(getOldClusterTestVersion())
         .nodes(NODE_NUM)
         .setting("path.repo", new Supplier<>() {
@@ -69,7 +68,7 @@ public String get() {
         .build();
 
     @ClassRule
-    public static TestRule ruleChain = RuleChain.outerRule(repoDirectory).around(cluster);
+    public static TestRule ruleChain = RuleChain.outerRule(versionLimit).around(repoDirectory).around(cluster);
 
     public FileSettingsUpgradeIT(@Name("upgradedNodes") int upgradedNodes) {
         super(upgradedNodes);