diff --git a/tests/draft6/propertyNames.json b/tests/draft6/propertyNames.json
new file mode 100644
index 00000000..165d17c7
--- /dev/null
+++ b/tests/draft6/propertyNames.json
@@ -0,0 +1,36 @@
+[
+    {
+        "description": "propertyNames validation",
+        "schema": {
+            "propertyNames": {"maxLength": 3}
+        },
+        "tests": [
+            {
+                "description": "all property names valid",
+                "data": {
+                    "f": {},
+                    "foo": {}
+                },
+                "valid": true
+            },
+            {
+                "description": "some property names invalid",
+                "data": {
+                    "foo": {},
+                    "foobar": {}
+                },
+                "valid": false
+            },
+            {
+                "description": "object without properties is valid",
+                "data": {},
+                "valid": true
+            },
+            {
+                "description": "non-object is valid",
+                "data": [],
+                "valid": true
+            }
+        ]
+    }
+]