diff --git a/tests/draft-next/additionalProperties.json b/tests/draft-next/additionalProperties.json
index 7859fbbf..606635e4 100644
--- a/tests/draft-next/additionalProperties.json
+++ b/tests/draft-next/additionalProperties.json
@@ -152,5 +152,29 @@
                 "valid": true
             }
         ]
+    },
+    {
+        "description": "additionalProperties with propertyNames",
+        "schema": {
+            "$schema": "https://json-schema.org/draft/next/schema",
+            "propertyNames": {
+                "maxLength": 5
+            },
+            "additionalProperties": {
+                "type": "number"
+            }
+        },
+        "tests": [
+            {
+                "description": "Valid against both keywords",
+                "data": { "apple": 4 },
+                "valid": true
+            },
+            {
+                "description": "Valid against propertyNames, but not unevaluatedProperties",
+                "data": { "fig": 2, "pear": "available" },
+                "valid": false
+            }
+        ]
     }
 ]
diff --git a/tests/draft2019-09/additionalProperties.json b/tests/draft2019-09/additionalProperties.json
index f9f03bb0..dab3e89b 100644
--- a/tests/draft2019-09/additionalProperties.json
+++ b/tests/draft2019-09/additionalProperties.json
@@ -152,5 +152,29 @@
                 "valid": true
             }
         ]
+    },
+    {
+        "description": "additionalProperties with propertyNames",
+        "schema": {
+            "$schema": "https://json-schema.org/draft/next/schema",
+            "propertyNames": {
+                "maxLength": 5
+            },
+            "additionalProperties": {
+                "type": "number"
+            }
+        },
+        "tests": [
+            {
+                "description": "Valid against both keywords",
+                "data": { "apple": 4 },
+                "valid": true
+            },
+            {
+                "description": "Valid against propertyNames, but not unevaluatedProperties",
+                "data": { "fig": 2, "pear": "available" },
+                "valid": false
+            }
+        ]
     }
 ]
diff --git a/tests/draft2020-12/additionalProperties.json b/tests/draft2020-12/additionalProperties.json
index cae4d3c7..d48a498a 100644
--- a/tests/draft2020-12/additionalProperties.json
+++ b/tests/draft2020-12/additionalProperties.json
@@ -158,5 +158,29 @@
                 "valid": true
             }
         ]
+    },
+    {
+        "description": "additionalProperties with propertyNames",
+        "schema": {
+            "$schema": "https://json-schema.org/draft/2020-12/schema",
+            "propertyNames": {
+                "maxLength": 5
+            },
+            "additionalProperties": {
+                "type": "number"
+            }
+        },
+        "tests": [
+            {
+                "description": "Valid against both keywords",
+                "data": { "apple": 4 },
+                "valid": true
+            },
+            {
+                "description": "Valid against propertyNames, but not unevaluatedProperties",
+                "data": { "fig": 2, "pear": "available" },
+                "valid": false
+            }
+        ]
     }
 ]