diff --git a/test/unified-test-format/invalid/entity-client-storeEventsAsEntities-minItems.json b/test/unified-test-format/invalid/entity-client-storeEventsAsEntities-minItems.json
deleted file mode 100644
index d94863ed11..0000000000
--- a/test/unified-test-format/invalid/entity-client-storeEventsAsEntities-minItems.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "description": "entity-client-storeEventsAsEntities-minItems",
-  "schemaVersion": "1.2",
-  "createEntities": [
-    {
-      "client": {
-        "id": "client0",
-        "storeEventsAsEntities": []
-      }
-    }
-  ],
-  "tests": [
-    {
-      "description": "foo",
-      "operations": []
-    }
-  ]
-}
diff --git a/test/unified-test-format/invalid/entity-client-storeEventsAsEntities-type.json b/test/unified-test-format/invalid/entity-client-storeEventsAsEntities-type.json
deleted file mode 100644
index 79f6b85ed2..0000000000
--- a/test/unified-test-format/invalid/entity-client-storeEventsAsEntities-type.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "description": "entity-client-storeEventsAsEntities-type",
-  "schemaVersion": "1.2",
-  "createEntities": [
-    {
-      "client": {
-        "id": "client0",
-        "storeEventsAsEntities": 0
-      }
-    }
-  ],
-  "tests": [
-    {
-      "description": "foo",
-      "operations": []
-    }
-  ]
-}
diff --git a/test/unified-test-format/invalid/storeEventsAsEntity-additionalProperties.json b/test/unified-test-format/invalid/storeEventsAsEntity-additionalProperties.json
deleted file mode 100644
index 5357da8d8d..0000000000
--- a/test/unified-test-format/invalid/storeEventsAsEntity-additionalProperties.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "description": "storeEventsAsEntity-additionalProperties",
-  "schemaVersion": "1.2",
-  "createEntities": [
-    {
-      "client": {
-        "id": "client0",
-        "storeEventsAsEntities": [
-          {
-            "id": "client0_events",
-            "events": [
-              "CommandStartedEvent"
-            ],
-            "foo": 0
-          }
-        ]
-      }
-    }
-  ],
-  "tests": [
-    {
-      "description": "foo",
-      "operations": []
-    }
-  ]
-}
diff --git a/test/unified-test-format/invalid/storeEventsAsEntity-events-enum.json b/test/unified-test-format/invalid/storeEventsAsEntity-events-enum.json
deleted file mode 100644
index ee99a55381..0000000000
--- a/test/unified-test-format/invalid/storeEventsAsEntity-events-enum.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "description": "storeEventsAsEntity-events-enum",
-  "schemaVersion": "1.2",
-  "createEntities": [
-    {
-      "client": {
-        "id": "client0",
-        "storeEventsAsEntities": [
-          {
-            "id": "client0_events",
-            "events": [
-              "foo"
-            ]
-          }
-        ]
-      }
-    }
-  ],
-  "tests": [
-    {
-      "description": "foo",
-      "operations": []
-    }
-  ]
-}
diff --git a/test/unified-test-format/invalid/storeEventsAsEntity-events-minItems.json b/test/unified-test-format/invalid/storeEventsAsEntity-events-minItems.json
deleted file mode 100644
index ddab042b1b..0000000000
--- a/test/unified-test-format/invalid/storeEventsAsEntity-events-minItems.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "description": "storeEventsAsEntity-events-minItems",
-  "schemaVersion": "1.2",
-  "createEntities": [
-    {
-      "client": {
-        "id": "client0",
-        "storeEventsAsEntities": [
-          {
-            "id": "client0_events",
-            "events": []
-          }
-        ]
-      }
-    }
-  ],
-  "tests": [
-    {
-      "description": "foo",
-      "operations": []
-    }
-  ]
-}
diff --git a/test/unified-test-format/invalid/storeEventsAsEntity-events-required.json b/test/unified-test-format/invalid/storeEventsAsEntity-events-required.json
deleted file mode 100644
index 90b45918ce..0000000000
--- a/test/unified-test-format/invalid/storeEventsAsEntity-events-required.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "description": "storeEventsAsEntity-events-required",
-  "schemaVersion": "1.2",
-  "createEntities": [
-    {
-      "client": {
-        "id": "client0",
-        "storeEventsAsEntities": [
-          {
-            "id": "client0_events"
-          }
-        ]
-      }
-    }
-  ],
-  "tests": [
-    {
-      "description": "foo",
-      "operations": []
-    }
-  ]
-}
diff --git a/test/unified-test-format/invalid/storeEventsAsEntity-events-type.json b/test/unified-test-format/invalid/storeEventsAsEntity-events-type.json
deleted file mode 100644
index 1b920ebd5d..0000000000
--- a/test/unified-test-format/invalid/storeEventsAsEntity-events-type.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "description": "storeEventsAsEntity-events-type",
-  "schemaVersion": "1.2",
-  "createEntities": [
-    {
-      "client": {
-        "id": "client0",
-        "storeEventsAsEntities": [
-          {
-            "id": "client0_events",
-            "events": 0
-          }
-        ]
-      }
-    }
-  ],
-  "tests": [
-    {
-      "description": "foo",
-      "operations": []
-    }
-  ]
-}
diff --git a/test/unified-test-format/invalid/storeEventsAsEntity-id-required.json b/test/unified-test-format/invalid/storeEventsAsEntity-id-required.json
deleted file mode 100644
index 71387c5315..0000000000
--- a/test/unified-test-format/invalid/storeEventsAsEntity-id-required.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-  "description": "storeEventsAsEntity-id-required",
-  "schemaVersion": "1.2",
-  "createEntities": [
-    {
-      "client": {
-        "id": "client0",
-        "storeEventsAsEntities": [
-          {
-            "events": [
-              "CommandStartedEvent"
-            ]
-          }
-        ]
-      }
-    }
-  ],
-  "tests": [
-    {
-      "description": "foo",
-      "operations": []
-    }
-  ]
-}
diff --git a/test/unified-test-format/invalid/storeEventsAsEntity-id-type.json b/test/unified-test-format/invalid/storeEventsAsEntity-id-type.json
deleted file mode 100644
index 4f52dc2533..0000000000
--- a/test/unified-test-format/invalid/storeEventsAsEntity-id-type.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "description": "storeEventsAsEntity-id-type",
-  "schemaVersion": "1.2",
-  "createEntities": [
-    {
-      "client": {
-        "id": "client0",
-        "storeEventsAsEntities": [
-          {
-            "id": 0,
-            "events": [
-              "CommandStartedEvent"
-            ]
-          }
-        ]
-      }
-    }
-  ],
-  "tests": [
-    {
-      "description": "foo",
-      "operations": []
-    }
-  ]
-}
diff --git a/test/unified-test-format/valid-fail/entity-client-storeEventsAsEntities-conflict_with_client_id.json b/test/unified-test-format/valid-fail/entity-client-storeEventsAsEntities-conflict_with_client_id.json
deleted file mode 100644
index 8c0c4d2041..0000000000
--- a/test/unified-test-format/valid-fail/entity-client-storeEventsAsEntities-conflict_with_client_id.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  "description": "entity-client-storeEventsAsEntities-conflict_with_client_id",
-  "schemaVersion": "1.2",
-  "createEntities": [
-    {
-      "client": {
-        "id": "client0",
-        "storeEventsAsEntities": [
-          {
-            "id": "client0",
-            "events": [
-              "PoolCreatedEvent",
-              "PoolReadyEvent",
-              "PoolClearedEvent",
-              "PoolClosedEvent"
-            ]
-          }
-        ]
-      }
-    }
-  ],
-  "tests": [
-    {
-      "description": "foo",
-      "operations": []
-    }
-  ]
-}
diff --git a/test/unified-test-format/valid-fail/entity-client-storeEventsAsEntities-conflict_within_different_array.json b/test/unified-test-format/valid-fail/entity-client-storeEventsAsEntities-conflict_within_different_array.json
deleted file mode 100644
index 77bc4abf2e..0000000000
--- a/test/unified-test-format/valid-fail/entity-client-storeEventsAsEntities-conflict_within_different_array.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  "description": "entity-client-storeEventsAsEntities-conflict_within_different_array",
-  "schemaVersion": "1.2",
-  "createEntities": [
-    {
-      "client": {
-        "id": "client0",
-        "storeEventsAsEntities": [
-          {
-            "id": "events",
-            "events": [
-              "PoolCreatedEvent",
-              "PoolReadyEvent",
-              "PoolClearedEvent",
-              "PoolClosedEvent"
-            ]
-          }
-        ]
-      }
-    },
-    {
-      "client": {
-        "id": "client1",
-        "storeEventsAsEntities": [
-          {
-            "id": "events",
-            "events": [
-              "CommandStartedEvent",
-              "CommandSucceededEvent",
-              "CommandFailedEvent"
-            ]
-          }
-        ]
-      }
-    }
-  ],
-  "tests": [
-    {
-      "description": "foo",
-      "operations": []
-    }
-  ]
-}
diff --git a/test/unified-test-format/valid-fail/entity-client-storeEventsAsEntities-conflict_within_same_array.json b/test/unified-test-format/valid-fail/entity-client-storeEventsAsEntities-conflict_within_same_array.json
deleted file mode 100644
index e1a9499883..0000000000
--- a/test/unified-test-format/valid-fail/entity-client-storeEventsAsEntities-conflict_within_same_array.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-  "description": "entity-client-storeEventsAsEntities-conflict_within_same_array",
-  "schemaVersion": "1.2",
-  "createEntities": [
-    {
-      "client": {
-        "id": "client0",
-        "storeEventsAsEntities": [
-          {
-            "id": "events",
-            "events": [
-              "PoolCreatedEvent",
-              "PoolReadyEvent",
-              "PoolClearedEvent",
-              "PoolClosedEvent"
-            ]
-          },
-          {
-            "id": "events",
-            "events": [
-              "CommandStartedEvent",
-              "CommandSucceededEvent",
-              "CommandFailedEvent"
-            ]
-          }
-        ]
-      }
-    }
-  ],
-  "tests": [
-    {
-      "description": "foo",
-      "operations": []
-    }
-  ]
-}
diff --git a/test/unified-test-format/valid-pass/entity-client-storeEventsAsEntities.json b/test/unified-test-format/valid-pass/entity-client-storeEventsAsEntities.json
deleted file mode 100644
index e37e5a1acd..0000000000
--- a/test/unified-test-format/valid-pass/entity-client-storeEventsAsEntities.json
+++ /dev/null
@@ -1,67 +0,0 @@
-{
-  "description": "entity-client-storeEventsAsEntities",
-  "schemaVersion": "1.2",
-  "createEntities": [
-    {
-      "client": {
-        "id": "client0",
-        "storeEventsAsEntities": [
-          {
-            "id": "client0_events",
-            "events": [
-              "CommandStartedEvent",
-              "CommandSucceededEvent",
-              "CommandFailedEvent"
-            ]
-          }
-        ]
-      }
-    },
-    {
-      "database": {
-        "id": "database0",
-        "client": "client0",
-        "databaseName": "test"
-      }
-    },
-    {
-      "collection": {
-        "id": "collection0",
-        "database": "database0",
-        "collectionName": "coll0"
-      }
-    }
-  ],
-  "initialData": [
-    {
-      "collectionName": "coll0",
-      "databaseName": "test",
-      "documents": [
-        {
-          "_id": 1,
-          "x": 11
-        }
-      ]
-    }
-  ],
-  "tests": [
-    {
-      "description": "storeEventsAsEntities captures events",
-      "operations": [
-        {
-          "name": "find",
-          "object": "collection0",
-          "arguments": {
-            "filter": {}
-          },
-          "expectResult": [
-            {
-              "_id": 1,
-              "x": 11
-            }
-          ]
-        }
-      ]
-    }
-  ]
-}