diff --git a/tests/draft-next/anchor.json b/tests/draft-next/anchor.json
index 321d8446..a0c4c51a 100644
--- a/tests/draft-next/anchor.json
+++ b/tests/draft-next/anchor.json
@@ -81,64 +81,6 @@
             }
         ]
     },
-    {
-        "description": "$anchor inside an enum is not a real identifier",
-        "comment": "the implementation must not be confused by an $anchor buried in the enum",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "$defs": {
-                "anchor_in_enum": {
-                    "enum": [
-                        {
-                            "$anchor": "my_anchor",
-                            "type": "null"
-                        }
-                    ]
-                },
-                "real_identifier_in_schema": {
-                    "$anchor": "my_anchor",
-                    "type": "string"
-                },
-                "zzz_anchor_in_const": {
-                    "const": {
-                        "$anchor": "my_anchor",
-                        "type": "null"
-                    }
-                }
-            },
-            "anyOf": [
-                { "$ref": "#/$defs/anchor_in_enum" },
-                { "$ref": "#my_anchor" }
-            ]
-        },
-        "tests": [
-            {
-                "description": "exact match to enum, and type matches",
-                "data": {
-                    "$anchor": "my_anchor",
-                    "type": "null"
-                },
-                "valid": true
-            },
-            {
-                "description": "in implementations that strip $anchor, this may match either $def",
-                "data": {
-                    "type": "null"
-                },
-                "valid": false
-            },
-            {
-                "description": "match $ref to $anchor",
-                "data": "a string to match #/$defs/anchor_in_enum",
-                "valid": true
-            },
-            {
-                "description": "no match on enum or $ref to $anchor",
-                "data": 1,
-                "valid": false
-            }
-        ]
-    },
     {
         "description": "same $anchor with different base uri",
         "schema": {
@@ -175,38 +117,6 @@
             }
         ]
     },
-    {
-        "description": "non-schema object containing an $anchor property",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "$defs": {
-                "const_not_anchor": {
-                    "const": {
-                        "$anchor": "not_a_real_anchor"
-                    }
-                }
-            },
-            "if": {
-                "const": "skip not_a_real_anchor"
-            },
-            "then": true,
-            "else" : {
-                "$ref": "#/$defs/const_not_anchor"
-            }
-        },
-        "tests": [
-            {
-                "description": "skip traversing definition for a valid result",
-                "data": "skip not_a_real_anchor",
-                "valid": true
-            },
-            {
-                "description": "const at const_not_anchor does not match",
-                "data": 1,
-                "valid": false
-            }
-        ]
-    },
     {
         "description": "invalid anchors",
         "schema": {
diff --git a/tests/draft-next/id.json b/tests/draft-next/id.json
index 9b3a591f..fe74c6bf 100644
--- a/tests/draft-next/id.json
+++ b/tests/draft-next/id.json
@@ -207,88 +207,5 @@
                 "valid": true
             }
         ]
-    },
-    {
-        "description": "$id inside an enum is not a real identifier",
-        "comment": "the implementation must not be confused by an $id buried in the enum",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "$defs": {
-                "id_in_enum": {
-                    "enum": [
-                        {
-                          "$id": "https://localhost:1234/draft-next/id/my_identifier.json",
-                          "type": "null"
-                        }
-                    ]
-                },
-                "real_id_in_schema": {
-                    "$id": "https://localhost:1234/draft-next/id/my_identifier.json",
-                    "type": "string"
-                },
-                "zzz_id_in_const": {
-                    "const": {
-                        "$id": "https://localhost:1234/draft-next/id/my_identifier.json",
-                        "type": "null"
-                    }
-                }
-            },
-            "anyOf": [
-                { "$ref": "#/$defs/id_in_enum" },
-                { "$ref": "https://localhost:1234/draft-next/id/my_identifier.json" }
-            ]
-        },
-        "tests": [
-            {
-                "description": "exact match to enum, and type matches",
-                "data": {
-                    "$id": "https://localhost:1234/draft-next/id/my_identifier.json",
-                    "type": "null"
-                },
-                "valid": true
-            },
-            {
-                "description": "match $ref to $id",
-                "data": "a string to match #/$defs/id_in_enum",
-                "valid": true
-            },
-            {
-                "description": "no match on enum or $ref to $id",
-                "data": 1,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "non-schema object containing an $id property",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/next/schema",
-            "$defs": {
-                "const_not_id": {
-                    "const": {
-                        "$id": "not_a_real_id"
-                    }
-                }
-            },
-            "if": {
-                "const": "skip not_a_real_id"
-            },
-            "then": true,
-            "else" : {
-                "$ref": "#/$defs/const_not_id"
-            }
-        },
-        "tests": [
-            {
-                "description": "skip traversing definition for a valid result",
-                "data": "skip not_a_real_id",
-                "valid": true
-            },
-            {
-                "description": "const at const_not_id does not match",
-                "data": 1,
-                "valid": false
-            }
-        ]
     }
 ]
diff --git a/tests/draft-next/optional/anchor.json b/tests/draft-next/optional/anchor.json
new file mode 100644
index 00000000..1de0b7a7
--- /dev/null
+++ b/tests/draft-next/optional/anchor.json
@@ -0,0 +1,60 @@
+[
+    {
+        "description": "$anchor inside an enum is not a real identifier",
+        "comment": "the implementation must not be confused by an $anchor buried in the enum",
+        "schema": {
+            "$schema": "https://json-schema.org/draft/next/schema",
+            "$defs": {
+                "anchor_in_enum": {
+                    "enum": [
+                        {
+                            "$anchor": "my_anchor",
+                            "type": "null"
+                        }
+                    ]
+                },
+                "real_identifier_in_schema": {
+                    "$anchor": "my_anchor",
+                    "type": "string"
+                },
+                "zzz_anchor_in_const": {
+                    "const": {
+                        "$anchor": "my_anchor",
+                        "type": "null"
+                    }
+                }
+            },
+            "anyOf": [
+                { "$ref": "#/$defs/anchor_in_enum" },
+                { "$ref": "#my_anchor" }
+            ]
+        },
+        "tests": [
+            {
+                "description": "exact match to enum, and type matches",
+                "data": {
+                    "$anchor": "my_anchor",
+                    "type": "null"
+                },
+                "valid": true
+            },
+            {
+                "description": "in implementations that strip $anchor, this may match either $def",
+                "data": {
+                    "type": "null"
+                },
+                "valid": false
+            },
+            {
+                "description": "match $ref to $anchor",
+                "data": "a string to match #/$defs/anchor_in_enum",
+                "valid": true
+            },
+            {
+                "description": "no match on enum or $ref to $anchor",
+                "data": 1,
+                "valid": false
+            }
+        ]
+    }
+]
diff --git a/tests/draft-next/optional/id.json b/tests/draft-next/optional/id.json
new file mode 100644
index 00000000..fc26f26c
--- /dev/null
+++ b/tests/draft-next/optional/id.json
@@ -0,0 +1,53 @@
+[
+    {
+        "description": "$id inside an enum is not a real identifier",
+        "comment": "the implementation must not be confused by an $id buried in the enum",
+        "schema": {
+            "$schema": "https://json-schema.org/draft/next/schema",
+            "$defs": {
+                "id_in_enum": {
+                    "enum": [
+                        {
+                          "$id": "https://localhost:1234/draft-next/id/my_identifier.json",
+                          "type": "null"
+                        }
+                    ]
+                },
+                "real_id_in_schema": {
+                    "$id": "https://localhost:1234/draft-next/id/my_identifier.json",
+                    "type": "string"
+                },
+                "zzz_id_in_const": {
+                    "const": {
+                        "$id": "https://localhost:1234/draft-next/id/my_identifier.json",
+                        "type": "null"
+                    }
+                }
+            },
+            "anyOf": [
+                { "$ref": "#/$defs/id_in_enum" },
+                { "$ref": "https://localhost:1234/draft-next/id/my_identifier.json" }
+            ]
+        },
+        "tests": [
+            {
+                "description": "exact match to enum, and type matches",
+                "data": {
+                    "$id": "https://localhost:1234/draft-next/id/my_identifier.json",
+                    "type": "null"
+                },
+                "valid": true
+            },
+            {
+                "description": "match $ref to $id",
+                "data": "a string to match #/$defs/id_in_enum",
+                "valid": true
+            },
+            {
+                "description": "no match on enum or $ref to $id",
+                "data": 1,
+                "valid": false
+            }
+        ]
+    }
+]
diff --git a/tests/draft-next/unknownKeyword.json b/tests/draft-next/optional/unknownKeyword.json
similarity index 100%
rename from tests/draft-next/unknownKeyword.json
rename to tests/draft-next/optional/unknownKeyword.json
diff --git a/tests/draft2019-09/anchor.json b/tests/draft2019-09/anchor.json
index 5d8c86f1..eb0a969a 100644
--- a/tests/draft2019-09/anchor.json
+++ b/tests/draft2019-09/anchor.json
@@ -81,64 +81,6 @@
             }
         ]
     },
-    {
-        "description": "$anchor inside an enum is not a real identifier",
-        "comment": "the implementation must not be confused by an $anchor buried in the enum",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "$defs": {
-                "anchor_in_enum": {
-                    "enum": [
-                        {
-                            "$anchor": "my_anchor",
-                            "type": "null"
-                        }
-                    ]
-                },
-                "real_identifier_in_schema": {
-                    "$anchor": "my_anchor",
-                    "type": "string"
-                },
-                "zzz_anchor_in_const": {
-                    "const": {
-                        "$anchor": "my_anchor",
-                        "type": "null"
-                    }
-                }
-            },
-            "anyOf": [
-                { "$ref": "#/$defs/anchor_in_enum" },
-                { "$ref": "#my_anchor" }
-            ]
-        },
-        "tests": [
-            {
-                "description": "exact match to enum, and type matches",
-                "data": {
-                    "$anchor": "my_anchor",
-                    "type": "null"
-                },
-                "valid": true
-            },
-            {
-                "description": "in implementations that strip $anchor, this may match either $def",
-                "data": {
-                    "type": "null"
-                },
-                "valid": false
-            },
-            {
-                "description": "match $ref to $anchor",
-                "data": "a string to match #/$defs/anchor_in_enum",
-                "valid": true
-            },
-            {
-                "description": "no match on enum or $ref to $anchor",
-                "data": 1,
-                "valid": false
-            }
-        ]
-    },
     {
         "description": "same $anchor with different base uri",
         "schema": {
@@ -175,38 +117,6 @@
             }
         ]
     },
-    {
-        "description": "non-schema object containing an $anchor property",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "$defs": {
-                "const_not_anchor": {
-                    "const": {
-                        "$anchor": "not_a_real_anchor"
-                    }
-                }
-            },
-            "if": {
-                "const": "skip not_a_real_anchor"
-            },
-            "then": true,
-            "else" : {
-                "$ref": "#/$defs/const_not_anchor"
-            }
-        },
-        "tests": [
-            {
-                "description": "skip traversing definition for a valid result",
-                "data": "skip not_a_real_anchor",
-                "valid": true
-            },
-            {
-                "description": "const at const_not_anchor does not match",
-                "data": 1,
-                "valid": false
-            }
-        ]
-    },
     {
         "description": "invalid anchors",
         "comment": "Section 8.2.3",
diff --git a/tests/draft2019-09/id.json b/tests/draft2019-09/id.json
index e2e403f0..0ba31387 100644
--- a/tests/draft2019-09/id.json
+++ b/tests/draft2019-09/id.json
@@ -207,88 +207,5 @@
                 "valid": true
             }
         ]
-    },
-    {
-        "description": "$id inside an enum is not a real identifier",
-        "comment": "the implementation must not be confused by an $id buried in the enum",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "$defs": {
-                "id_in_enum": {
-                    "enum": [
-                        {
-                          "$id": "https://localhost:1234/draft2019-09/id/my_identifier.json",
-                          "type": "null"
-                        }
-                    ]
-                },
-                "real_id_in_schema": {
-                    "$id": "https://localhost:1234/draft2019-09/id/my_identifier.json",
-                    "type": "string"
-                },
-                "zzz_id_in_const": {
-                    "const": {
-                        "$id": "https://localhost:1234/draft2019-09/id/my_identifier.json",
-                        "type": "null"
-                    }
-                }
-            },
-            "anyOf": [
-                { "$ref": "#/$defs/id_in_enum" },
-                { "$ref": "https://localhost:1234/draft2019-09/id/my_identifier.json" }
-            ]
-        },
-        "tests": [
-            {
-                "description": "exact match to enum, and type matches",
-                "data": {
-                    "$id": "https://localhost:1234/draft2019-09/id/my_identifier.json",
-                    "type": "null"
-                },
-                "valid": true
-            },
-            {
-                "description": "match $ref to $id",
-                "data": "a string to match #/$defs/id_in_enum",
-                "valid": true
-            },
-            {
-                "description": "no match on enum or $ref to $id",
-                "data": 1,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "non-schema object containing an $id property",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2019-09/schema",
-            "$defs": {
-                "const_not_id": {
-                    "const": {
-                        "$id": "not_a_real_id"
-                    }
-                }
-            },
-            "if": {
-                "const": "skip not_a_real_id"
-            },
-            "then": true,
-            "else" : {
-                "$ref": "#/$defs/const_not_id"
-            }
-        },
-        "tests": [
-            {
-                "description": "skip traversing definition for a valid result",
-                "data": "skip not_a_real_id",
-                "valid": true
-            },
-            {
-                "description": "const at const_not_id does not match",
-                "data": 1,
-                "valid": false
-            }
-        ]
     }
 ]
diff --git a/tests/draft2019-09/optional/anchor.json b/tests/draft2019-09/optional/anchor.json
new file mode 100644
index 00000000..45951d0a
--- /dev/null
+++ b/tests/draft2019-09/optional/anchor.json
@@ -0,0 +1,60 @@
+[
+    {
+        "description": "$anchor inside an enum is not a real identifier",
+        "comment": "the implementation must not be confused by an $anchor buried in the enum",
+        "schema": {
+            "$schema": "https://json-schema.org/draft/2019-09/schema",
+            "$defs": {
+                "anchor_in_enum": {
+                    "enum": [
+                        {
+                            "$anchor": "my_anchor",
+                            "type": "null"
+                        }
+                    ]
+                },
+                "real_identifier_in_schema": {
+                    "$anchor": "my_anchor",
+                    "type": "string"
+                },
+                "zzz_anchor_in_const": {
+                    "const": {
+                        "$anchor": "my_anchor",
+                        "type": "null"
+                    }
+                }
+            },
+            "anyOf": [
+                { "$ref": "#/$defs/anchor_in_enum" },
+                { "$ref": "#my_anchor" }
+            ]
+        },
+        "tests": [
+            {
+                "description": "exact match to enum, and type matches",
+                "data": {
+                    "$anchor": "my_anchor",
+                    "type": "null"
+                },
+                "valid": true
+            },
+            {
+                "description": "in implementations that strip $anchor, this may match either $def",
+                "data": {
+                    "type": "null"
+                },
+                "valid": false
+            },
+            {
+                "description": "match $ref to $anchor",
+                "data": "a string to match #/$defs/anchor_in_enum",
+                "valid": true
+            },
+            {
+                "description": "no match on enum or $ref to $anchor",
+                "data": 1,
+                "valid": false
+            }
+        ]
+    }
+]
diff --git a/tests/draft2019-09/optional/id.json b/tests/draft2019-09/optional/id.json
new file mode 100644
index 00000000..4daa8f51
--- /dev/null
+++ b/tests/draft2019-09/optional/id.json
@@ -0,0 +1,53 @@
+[
+    {
+        "description": "$id inside an enum is not a real identifier",
+        "comment": "the implementation must not be confused by an $id buried in the enum",
+        "schema": {
+            "$schema": "https://json-schema.org/draft/2019-09/schema",
+            "$defs": {
+                "id_in_enum": {
+                    "enum": [
+                        {
+                          "$id": "https://localhost:1234/draft2019-09/id/my_identifier.json",
+                          "type": "null"
+                        }
+                    ]
+                },
+                "real_id_in_schema": {
+                    "$id": "https://localhost:1234/draft2019-09/id/my_identifier.json",
+                    "type": "string"
+                },
+                "zzz_id_in_const": {
+                    "const": {
+                        "$id": "https://localhost:1234/draft2019-09/id/my_identifier.json",
+                        "type": "null"
+                    }
+                }
+            },
+            "anyOf": [
+                { "$ref": "#/$defs/id_in_enum" },
+                { "$ref": "https://localhost:1234/draft2019-09/id/my_identifier.json" }
+            ]
+        },
+        "tests": [
+            {
+                "description": "exact match to enum, and type matches",
+                "data": {
+                    "$id": "https://localhost:1234/draft2019-09/id/my_identifier.json",
+                    "type": "null"
+                },
+                "valid": true
+            },
+            {
+                "description": "match $ref to $id",
+                "data": "a string to match #/$defs/id_in_enum",
+                "valid": true
+            },
+            {
+                "description": "no match on enum or $ref to $id",
+                "data": 1,
+                "valid": false
+            }
+        ]
+    }
+]
diff --git a/tests/draft2019-09/unknownKeyword.json b/tests/draft2019-09/optional/unknownKeyword.json
similarity index 100%
rename from tests/draft2019-09/unknownKeyword.json
rename to tests/draft2019-09/optional/unknownKeyword.json
diff --git a/tests/draft2020-12/anchor.json b/tests/draft2020-12/anchor.json
index 423835da..83a7166d 100644
--- a/tests/draft2020-12/anchor.json
+++ b/tests/draft2020-12/anchor.json
@@ -81,64 +81,6 @@
             }
         ]
     },
-    {
-        "description": "$anchor inside an enum is not a real identifier",
-        "comment": "the implementation must not be confused by an $anchor buried in the enum",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "$defs": {
-                "anchor_in_enum": {
-                    "enum": [
-                        {
-                            "$anchor": "my_anchor",
-                            "type": "null"
-                        }
-                    ]
-                },
-                "real_identifier_in_schema": {
-                    "$anchor": "my_anchor",
-                    "type": "string"
-                },
-                "zzz_anchor_in_const": {
-                    "const": {
-                        "$anchor": "my_anchor",
-                        "type": "null"
-                    }
-                }
-            },
-            "anyOf": [
-                { "$ref": "#/$defs/anchor_in_enum" },
-                { "$ref": "#my_anchor" }
-            ]
-        },
-        "tests": [
-            {
-                "description": "exact match to enum, and type matches",
-                "data": {
-                    "$anchor": "my_anchor",
-                    "type": "null"
-                },
-                "valid": true
-            },
-            {
-                "description": "in implementations that strip $anchor, this may match either $def",
-                "data": {
-                    "type": "null"
-                },
-                "valid": false
-            },
-            {
-                "description": "match $ref to $anchor",
-                "data": "a string to match #/$defs/anchor_in_enum",
-                "valid": true
-            },
-            {
-                "description": "no match on enum or $ref to $anchor",
-                "data": 1,
-                "valid": false
-            }
-        ]
-    },
     {
         "description": "same $anchor with different base uri",
         "schema": {
@@ -175,38 +117,6 @@
             }
         ]
     },
-    {
-        "description": "non-schema object containing an $anchor property",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "$defs": {
-                "const_not_anchor": {
-                    "const": {
-                        "$anchor": "not_a_real_anchor"
-                    }
-                }
-            },
-            "if": {
-                "const": "skip not_a_real_anchor"
-            },
-            "then": true,
-            "else" : {
-                "$ref": "#/$defs/const_not_anchor"
-            }
-        },
-        "tests": [
-            {
-                "description": "skip traversing definition for a valid result",
-                "data": "skip not_a_real_anchor",
-                "valid": true
-            },
-            {
-                "description": "const at const_not_anchor does not match",
-                "data": 1,
-                "valid": false
-            }
-        ]
-    },
     {
         "description": "invalid anchors",
         "comment": "Section 8.2.2",
diff --git a/tests/draft2020-12/id.json b/tests/draft2020-12/id.json
index 0ae5fe68..59265c4e 100644
--- a/tests/draft2020-12/id.json
+++ b/tests/draft2020-12/id.json
@@ -207,88 +207,5 @@
                 "valid": true
             }
         ]
-    },
-    {
-        "description": "$id inside an enum is not a real identifier",
-        "comment": "the implementation must not be confused by an $id buried in the enum",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "$defs": {
-                "id_in_enum": {
-                    "enum": [
-                        {
-                          "$id": "https://localhost:1234/draft2020-12/id/my_identifier.json",
-                          "type": "null"
-                        }
-                    ]
-                },
-                "real_id_in_schema": {
-                    "$id": "https://localhost:1234/draft2020-12/id/my_identifier.json",
-                    "type": "string"
-                },
-                "zzz_id_in_const": {
-                    "const": {
-                        "$id": "https://localhost:1234/draft2020-12/id/my_identifier.json",
-                        "type": "null"
-                    }
-                }
-            },
-            "anyOf": [
-                { "$ref": "#/$defs/id_in_enum" },
-                { "$ref": "https://localhost:1234/draft2020-12/id/my_identifier.json" }
-            ]
-        },
-        "tests": [
-            {
-                "description": "exact match to enum, and type matches",
-                "data": {
-                    "$id": "https://localhost:1234/draft2020-12/id/my_identifier.json",
-                    "type": "null"
-                },
-                "valid": true
-            },
-            {
-                "description": "match $ref to $id",
-                "data": "a string to match #/$defs/id_in_enum",
-                "valid": true
-            },
-            {
-                "description": "no match on enum or $ref to $id",
-                "data": 1,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "non-schema object containing an $id property",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "$defs": {
-                "const_not_id": {
-                    "const": {
-                        "$id": "not_a_real_id"
-                    }
-                }
-            },
-            "if": {
-                "const": "skip not_a_real_id"
-            },
-            "then": true,
-            "else" : {
-                "$ref": "#/$defs/const_not_id"
-            }
-        },
-        "tests": [
-            {
-                "description": "skip traversing definition for a valid result",
-                "data": "skip not_a_real_id",
-                "valid": true
-            },
-            {
-                "description": "const at const_not_id does not match",
-                "data": 1,
-                "valid": false
-            }
-        ]
     }
 ]
diff --git a/tests/draft2020-12/optional/anchor.json b/tests/draft2020-12/optional/anchor.json
new file mode 100644
index 00000000..6d6713be
--- /dev/null
+++ b/tests/draft2020-12/optional/anchor.json
@@ -0,0 +1,60 @@
+[
+    {
+        "description": "$anchor inside an enum is not a real identifier",
+        "comment": "the implementation must not be confused by an $anchor buried in the enum",
+        "schema": {
+            "$schema": "https://json-schema.org/draft/2020-12/schema",
+            "$defs": {
+                "anchor_in_enum": {
+                    "enum": [
+                        {
+                            "$anchor": "my_anchor",
+                            "type": "null"
+                        }
+                    ]
+                },
+                "real_identifier_in_schema": {
+                    "$anchor": "my_anchor",
+                    "type": "string"
+                },
+                "zzz_anchor_in_const": {
+                    "const": {
+                        "$anchor": "my_anchor",
+                        "type": "null"
+                    }
+                }
+            },
+            "anyOf": [
+                { "$ref": "#/$defs/anchor_in_enum" },
+                { "$ref": "#my_anchor" }
+            ]
+        },
+        "tests": [
+            {
+                "description": "exact match to enum, and type matches",
+                "data": {
+                    "$anchor": "my_anchor",
+                    "type": "null"
+                },
+                "valid": true
+            },
+            {
+                "description": "in implementations that strip $anchor, this may match either $def",
+                "data": {
+                    "type": "null"
+                },
+                "valid": false
+            },
+            {
+                "description": "match $ref to $anchor",
+                "data": "a string to match #/$defs/anchor_in_enum",
+                "valid": true
+            },
+            {
+                "description": "no match on enum or $ref to $anchor",
+                "data": 1,
+                "valid": false
+            }
+        ]
+    }
+]
diff --git a/tests/draft2020-12/optional/id.json b/tests/draft2020-12/optional/id.json
new file mode 100644
index 00000000..0b7df4e8
--- /dev/null
+++ b/tests/draft2020-12/optional/id.json
@@ -0,0 +1,53 @@
+[
+    {
+        "description": "$id inside an enum is not a real identifier",
+        "comment": "the implementation must not be confused by an $id buried in the enum",
+        "schema": {
+            "$schema": "https://json-schema.org/draft/2020-12/schema",
+            "$defs": {
+                "id_in_enum": {
+                    "enum": [
+                        {
+                          "$id": "https://localhost:1234/draft2020-12/id/my_identifier.json",
+                          "type": "null"
+                        }
+                    ]
+                },
+                "real_id_in_schema": {
+                    "$id": "https://localhost:1234/draft2020-12/id/my_identifier.json",
+                    "type": "string"
+                },
+                "zzz_id_in_const": {
+                    "const": {
+                        "$id": "https://localhost:1234/draft2020-12/id/my_identifier.json",
+                        "type": "null"
+                    }
+                }
+            },
+            "anyOf": [
+                { "$ref": "#/$defs/id_in_enum" },
+                { "$ref": "https://localhost:1234/draft2020-12/id/my_identifier.json" }
+            ]
+        },
+        "tests": [
+            {
+                "description": "exact match to enum, and type matches",
+                "data": {
+                    "$id": "https://localhost:1234/draft2020-12/id/my_identifier.json",
+                    "type": "null"
+                },
+                "valid": true
+            },
+            {
+                "description": "match $ref to $id",
+                "data": "a string to match #/$defs/id_in_enum",
+                "valid": true
+            },
+            {
+                "description": "no match on enum or $ref to $id",
+                "data": 1,
+                "valid": false
+            }
+        ]
+    }
+]
diff --git a/tests/draft2020-12/unknownKeyword.json b/tests/draft2020-12/optional/unknownKeyword.json
similarity index 100%
rename from tests/draft2020-12/unknownKeyword.json
rename to tests/draft2020-12/optional/unknownKeyword.json
diff --git a/tests/draft4/id.json b/tests/draft4/optional/id.json
similarity index 100%
rename from tests/draft4/id.json
rename to tests/draft4/optional/id.json
diff --git a/tests/draft6/id.json b/tests/draft6/optional/id.json
similarity index 100%
rename from tests/draft6/id.json
rename to tests/draft6/optional/id.json
diff --git a/tests/draft6/unknownKeyword.json b/tests/draft6/optional/unknownKeyword.json
similarity index 100%
rename from tests/draft6/unknownKeyword.json
rename to tests/draft6/optional/unknownKeyword.json
diff --git a/tests/draft7/id.json b/tests/draft7/optional/id.json
similarity index 100%
rename from tests/draft7/id.json
rename to tests/draft7/optional/id.json
diff --git a/tests/draft7/unknownKeyword.json b/tests/draft7/optional/unknownKeyword.json
similarity index 100%
rename from tests/draft7/unknownKeyword.json
rename to tests/draft7/optional/unknownKeyword.json