diff --git a/muted-tests.yml b/muted-tests.yml
index 440a67256ac45..de94d26acfe32 100644
--- a/muted-tests.yml
+++ b/muted-tests.yml
@@ -319,12 +319,6 @@ tests:
 - class: org.elasticsearch.xpack.security.CoreWithSecurityClientYamlTestSuiteIT
   method: test {yaml=cat.aliases/10_basic/Simple alias}
   issue: https://github.com/elastic/elasticsearch/issues/121186
-- class: org.elasticsearch.index.mapper.KeywordFieldMapperTests
-  method: testFieldTypeWithSkipDocValues_LogsDbMode
-  issue: https://github.com/elastic/elasticsearch/issues/121232
-- class: org.elasticsearch.index.mapper.KeywordFieldMapperTests
-  method: testFieldTypeDefault_ConfiguredDocValues
-  issue: https://github.com/elastic/elasticsearch/issues/121233
 - class: org.elasticsearch.xpack.ml.integration.ClassificationIT
   method: testWithDatastreams
   issue: https://github.com/elastic/elasticsearch/issues/121236
diff --git a/server/src/test/java/org/elasticsearch/index/mapper/KeywordFieldMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/KeywordFieldMapperTests.java
index d78f2110daa67..924c32f527f7a 100644
--- a/server/src/test/java/org/elasticsearch/index/mapper/KeywordFieldMapperTests.java
+++ b/server/src/test/java/org/elasticsearch/index/mapper/KeywordFieldMapperTests.java
@@ -773,6 +773,8 @@ public void testDocValuesLoadedFromStoredSynthetic() throws IOException {
     }
 
     public void testFieldTypeWithSkipDocValues_LogsDbMode() throws IOException {
+        assumeTrue("Needs feature flag to be enabled", FieldMapper.DOC_VALUES_SPARSE_INDEX.isEnabled());
+
         final MapperService mapperService = createMapperService(
             Settings.builder()
                 .put(IndexSettings.MODE.getKey(), IndexMode.LOGSDB.name())
@@ -792,6 +794,8 @@ public void testFieldTypeWithSkipDocValues_LogsDbMode() throws IOException {
     }
 
     public void testFieldTypeDefault_StandardMode() throws IOException {
+        assumeTrue("Needs feature flag to be enabled", FieldMapper.DOC_VALUES_SPARSE_INDEX.isEnabled());
+
         final MapperService mapperService = createMapperService(
             Settings.builder()
                 .put(IndexSettings.MODE.getKey(), IndexMode.STANDARD.name())
@@ -811,6 +815,8 @@ public void testFieldTypeDefault_StandardMode() throws IOException {
     }
 
     public void testFieldTypeDefault_NonMatchingFieldName() throws IOException {
+        assumeTrue("Needs feature flag to be enabled", FieldMapper.DOC_VALUES_SPARSE_INDEX.isEnabled());
+
         final MapperService mapperService = createMapperService(
             Settings.builder()
                 .put(IndexSettings.MODE.getKey(), IndexMode.LOGSDB.name())
@@ -830,6 +836,8 @@ public void testFieldTypeDefault_NonMatchingFieldName() throws IOException {
     }
 
     public void testFieldTypeDefault_ConfiguredIndexed() throws IOException {
+        assumeTrue("Needs feature flag to be enabled", FieldMapper.DOC_VALUES_SPARSE_INDEX.isEnabled());
+
         final MapperService mapperService = createMapperService(
             Settings.builder()
                 .put(IndexSettings.MODE.getKey(), IndexMode.LOGSDB.name())
@@ -850,6 +858,8 @@ public void testFieldTypeDefault_ConfiguredIndexed() throws IOException {
     }
 
     public void testFieldTypeDefault_ConfiguredDocValues() throws IOException {
+        assumeTrue("Needs feature flag to be enabled", FieldMapper.DOC_VALUES_SPARSE_INDEX.isEnabled());
+
         final MapperService mapperService = createMapperService(
             Settings.builder()
                 .put(IndexSettings.MODE.getKey(), IndexMode.LOGSDB.name())
@@ -870,6 +880,8 @@ public void testFieldTypeDefault_ConfiguredDocValues() throws IOException {
     }
 
     public void testFieldTypeDefault_LogsDbMode_NonSortField() throws IOException {
+        assumeTrue("Needs feature flag to be enabled", FieldMapper.DOC_VALUES_SPARSE_INDEX.isEnabled());
+
         final MapperService mapperService = createMapperService(
             Settings.builder().put(IndexSettings.MODE.getKey(), IndexMode.LOGSDB.name()).build(),
             mapping(b -> {
@@ -886,6 +898,8 @@ public void testFieldTypeDefault_LogsDbMode_NonSortField() throws IOException {
     }
 
     public void testFieldTypeWithSkipDocValues_IndexedFalseDocValuesTrue() throws IOException {
+        assumeTrue("Needs feature flag to be enabled", FieldMapper.DOC_VALUES_SPARSE_INDEX.isEnabled());
+
         final MapperService mapperService = createMapperService(
             Settings.builder()
                 .put(IndexSettings.MODE.getKey(), IndexMode.LOGSDB.name())
@@ -907,6 +921,8 @@ public void testFieldTypeWithSkipDocValues_IndexedFalseDocValuesTrue() throws IO
     }
 
     public void testFieldTypeDefault_IndexedFalseDocValuesFalse() throws IOException {
+        assumeTrue("Needs feature flag to be enabled", FieldMapper.DOC_VALUES_SPARSE_INDEX.isEnabled());
+
         final MapperService mapperService = createMapperService(
             Settings.builder()
                 .put(IndexSettings.MODE.getKey(), IndexMode.LOGSDB.name())