diff --git a/tests/test-grammar-integration.cpp b/tests/test-grammar-integration.cpp
index baf19e8d7..94e3fa164 100644
--- a/tests/test-grammar-integration.cpp
+++ b/tests/test-grammar-integration.cpp
@@ -1337,8 +1337,8 @@ static void test_json_schema() {
         {
             R"""({})""",
             R"""({"common": "", "a": "", "b": ""})""",
-            R"""({"a": "", "b": ""})""",
-            R"""({"common": "", "a": "", "b": "", "c": "", "d": ""})""",
+            R"""({"a": 0, "b": 0})""",
+            R"""({"common": 0, "a": "0", "b": 0, "c": 0, "d": 0})""",
         }
     );
 }
diff --git a/tests/test-json-schema-to-grammar.cpp b/tests/test-json-schema-to-grammar.cpp
index 0d7579f34..10278f5bd 100755
--- a/tests/test-json-schema-to-grammar.cpp
+++ b/tests/test-json-schema-to-grammar.cpp
@@ -1218,6 +1218,48 @@ static void test_all(const std::string & lang, std::function<void(const TestCase
         )"""
     });
 
+    test({
+        SUCCESS,
+        "nested refs + mix of properties and allOf",
+        // Schema
+        R"""({
+            "properties": {
+                "common": {"$ref": "#/$defs/SomeVal"}
+            },
+            "allOf": [
+                {"$ref": "#/$defs/foo"},
+                {"$ref": "#/$defs/bar"},
+                {
+                    "anyOf": [
+                        {"$ref": "#/$defs/baz"},
+                        {"$ref": "#/$defs/bam"}
+                    ]
+                }
+            ],
+            "required": ["common"],
+            "$defs": {
+                "SomeVal": {"type": "number"},
+                "foo": {"properties": {"a": {"$ref": "#/$defs/SomeVal"}}},
+                "bar": {"properties": {"b": {"$ref": "#/$defs/SomeVal"}}},
+                "bam": {"properties": {"c": {"$ref": "#/$defs/SomeVal"}}},
+                "baz": {"properties": {"d": {"$ref": "#/$defs/SomeVal"}}}
+            }
+        })""",
+        R"""(
+            a-kv ::= "\"a\"" space ":" space number
+            b-kv ::= "\"b\"" space ":" space number
+            c-kv ::= "\"c\"" space ":" space number
+            common-kv ::= "\"common\"" space ":" space number
+            d-kv ::= "\"d\"" space ":" space number
+            d-rest ::= ( "," space c-kv )?
+            decimal-part ::= [0-9]{1,16}
+            integral-part ::= [0] | [1-9] [0-9]{0,15}
+            number ::= ("-"? integral-part) ("." decimal-part)? ([eE] [-+]? integral-part)? space
+            root ::= "{" space common-kv "," space a-kv "," space b-kv ( "," space ( d-kv d-rest | c-kv ) )? "}" space
+            space ::= | " " | "\n" [ \t]{0,20}
+        )""",
+    });
+
     test({
         SUCCESS,
         "conflicting names",