diff --git a/indexer-core/src/test/resources/converter/integration-tests/index_records_1.schema b/indexer-core/src/test/resources/converter/integration-tests/index_records_1.schema
index 672c3d965d50194ac5c80adecfddbeb24d51a856..779d2d20921f97aa86bed06943358d76c3d5f71f 100644
--- a/indexer-core/src/test/resources/converter/integration-tests/index_records_1.schema
+++ b/indexer-core/src/test/resources/converter/integration-tests/index_records_1.schema
@@ -20,7 +20,11 @@
             },
             "County": {
               "type": "string"
-            },
+            }}}],
+      "anyOf": [
+        {
+          "type": "object",
+          "properties": {
             "State": {
               "type": "string"
             },
@@ -41,7 +45,11 @@
             },
             "EmptyAttribute": {
               "type": "string"
-            },
+            }}}],
+      "oneOf": [
+        {
+          "type": "object",
+          "properties": {
             "Rank": {
               "type": "integer"
             },
diff --git a/testing/indexer-test-core/src/main/resources/testData/index_records_1.schema.json b/testing/indexer-test-core/src/main/resources/testData/index_records_1.schema.json
index 2a6e6301a41b6b4f8d82839c2faca994336a46a3..9e54b33862a2f0b8d81277f79e2959b3b141e7bf 100644
--- a/testing/indexer-test-core/src/main/resources/testData/index_records_1.schema.json
+++ b/testing/indexer-test-core/src/main/resources/testData/index_records_1.schema.json
@@ -4,7 +4,7 @@
       "authority": "tenant1",
       "source": "indexer-int-test",
       "entityType": "sample-schema-1",
-      "schemaVersionMajor": "1",
+      "schemaVersionMajor": "2",
       "schemaVersionMinor": "0",
       "schemaVersionPatch": "4"
     },
@@ -32,7 +32,14 @@
               },
               "County": {
                 "type": "string"
-              },
+              }
+            }
+          }
+        ],
+        "anyOf": [
+          {
+            "type": "object",
+            "properties": {
               "State": {
                 "type": "string"
               },
@@ -53,7 +60,14 @@
               },
               "EmptyAttribute": {
                 "type": "string"
-              },
+              }
+            }
+          }
+        ],
+        "oneOf": [
+          {
+            "type": "object",
+            "properties": {
               "Rank": {
                 "type": "integer"
               },