diff --git a/server/src/internalClusterTest/java/org/opensearch/action/support/master/IndexingMasterFailoverIT.java b/server/src/internalClusterTest/java/org/opensearch/action/support/master/IndexingMasterFailoverIT.java
index 68739da2bef55..f8db63bc8b61d 100644
--- a/server/src/internalClusterTest/java/org/opensearch/action/support/master/IndexingMasterFailoverIT.java
+++ b/server/src/internalClusterTest/java/org/opensearch/action/support/master/IndexingMasterFailoverIT.java
@@ -97,7 +97,7 @@ public void run() {
                     return;
                 }
                 for (int i = 0; i < 10; i++) {
-                    // index data with mapping changes
+                    // index data
                     IndexResponse response = client(dataNode).prepareIndex("myindex").setSource("field_" + i, "val").get();
                     assertEquals(DocWriteResponse.Result.CREATED, response.getResult());
                 }
diff --git a/server/src/internalClusterTest/java/org/opensearch/search/suggest/CompletionSuggestSearchIT.java b/server/src/internalClusterTest/java/org/opensearch/search/suggest/CompletionSuggestSearchIT.java
index db09c34099ace..f76bfa67351e2 100644
--- a/server/src/internalClusterTest/java/org/opensearch/search/suggest/CompletionSuggestSearchIT.java
+++ b/server/src/internalClusterTest/java/org/opensearch/search/suggest/CompletionSuggestSearchIT.java
@@ -1288,7 +1288,6 @@ private static List<String> getNames(Suggest.Suggestion.Entry<Suggest.Suggestion
 
     private void createIndexAndMappingAndSettings(Settings settings, CompletionMappingBuilder completionMappingBuilder) throws IOException {
         XContentBuilder mapping = jsonBuilder().startObject()
-            .startObject(MapperService.SINGLE_MAPPING_NAME)
             .startObject("properties")
             .startObject("test_field")
             .field("type", "keyword")
@@ -1324,7 +1323,7 @@ private void createIndexAndMappingAndSettings(Settings settings, CompletionMappi
 
             mapping = mapping.endArray();
         }
-        mapping = mapping.endObject().endObject().endObject().endObject();
+        mapping = mapping.endObject().endObject().endObject();
 
         assertAcked(
             client().admin()