diff --git a/test/inputs/schema/minmaxlength.1.fail.minmaxlength.json b/test/inputs/schema/minmaxlength.1.fail.minmaxlength.json
index 61c61f89d..b5b80bdba 100644
--- a/test/inputs/schema/minmaxlength.1.fail.minmaxlength.json
+++ b/test/inputs/schema/minmaxlength.1.fail.minmaxlength.json
@@ -2,6 +2,7 @@
   "minlength": "aa",
   "maxlength": "bbb",
   "minmaxlength": "cccc",
+  "emptyOnly": "",
   "union": "dddddd",
   "inUnion": "cccc",
   "minMaxUnion": "eeeee",
diff --git a/test/inputs/schema/minmaxlength.1.json b/test/inputs/schema/minmaxlength.1.json
index b9ea9aba7..9cf4cab5e 100644
--- a/test/inputs/schema/minmaxlength.1.json
+++ b/test/inputs/schema/minmaxlength.1.json
@@ -2,6 +2,7 @@
   "minlength": "aaaa",
   "maxlength": "bbb",
   "minmaxlength": "cccc",
+  "emptyOnly": "",
   "union": "dddddd",
   "inUnion": "cccc",
   "minMaxUnion": "eeeee",
diff --git a/test/inputs/schema/minmaxlength.2.fail.minmaxlength.json b/test/inputs/schema/minmaxlength.2.fail.minmaxlength.json
new file mode 100644
index 000000000..aaf427dca
--- /dev/null
+++ b/test/inputs/schema/minmaxlength.2.fail.minmaxlength.json
@@ -0,0 +1,11 @@
+{
+  "minlength": "aaaa",
+  "maxlength": "bbb",
+  "minmaxlength": "cccc",
+  "emptyOnly": "",
+  "union": "dd",
+  "inUnion": "cccc",
+  "minMaxUnion": "eeeee",
+  "intersection": "ffff",
+  "minMaxIntersection": "gggg"
+}
diff --git a/test/inputs/schema/minmaxlength.3.fail.minmaxlength.json b/test/inputs/schema/minmaxlength.3.fail.minmaxlength.json
new file mode 100644
index 000000000..431dc03ce
--- /dev/null
+++ b/test/inputs/schema/minmaxlength.3.fail.minmaxlength.json
@@ -0,0 +1,11 @@
+{
+  "minlength": "aaaa",
+  "maxlength": "bbb",
+  "minmaxlength": "cccc",
+  "emptyOnly": "",
+  "union": "dddddd",
+  "inUnion": "cccc",
+  "minMaxUnion": "eeeee",
+  "intersection": "fff",
+  "minMaxIntersection": "gggg"
+}
diff --git a/test/inputs/schema/minmaxlength.4.fail.minmaxlength.json b/test/inputs/schema/minmaxlength.4.fail.minmaxlength.json
new file mode 100644
index 000000000..f96e035df
--- /dev/null
+++ b/test/inputs/schema/minmaxlength.4.fail.minmaxlength.json
@@ -0,0 +1,11 @@
+{
+  "minlength": "aaaa",
+  "maxlength": "bbb",
+  "minmaxlength": "cccc",
+  "emptyOnly": "",
+  "union": "dddddd",
+  "inUnion": "cccc",
+  "minMaxUnion": "eeeee",
+  "intersection": "ffff",
+  "minMaxIntersection": "gggggg"
+}
diff --git a/test/inputs/schema/minmaxlength.5.fail.minmaxlength.json b/test/inputs/schema/minmaxlength.5.fail.minmaxlength.json
new file mode 100644
index 000000000..739fc599c
--- /dev/null
+++ b/test/inputs/schema/minmaxlength.5.fail.minmaxlength.json
@@ -0,0 +1,11 @@
+{
+  "minlength": "aaaa",
+  "maxlength": "bbb",
+  "minmaxlength": "cccc",
+  "emptyOnly": "x",
+  "union": "dddddd",
+  "inUnion": "cccc",
+  "minMaxUnion": "eeeee",
+  "intersection": "ffff",
+  "minMaxIntersection": "gggg"
+}
diff --git a/test/inputs/schema/minmaxlength.6.fail.pattern.json b/test/inputs/schema/minmaxlength.6.fail.pattern.json
new file mode 100644
index 000000000..c3fbd7119
--- /dev/null
+++ b/test/inputs/schema/minmaxlength.6.fail.pattern.json
@@ -0,0 +1,11 @@
+{
+  "minlength": "aaaa",
+  "maxlength": "bbb",
+  "minmaxlength": "1234",
+  "emptyOnly": "",
+  "union": "dddddd",
+  "inUnion": "cccc",
+  "minMaxUnion": "eeeee",
+  "intersection": "ffff",
+  "minMaxIntersection": "gggg"
+}
diff --git a/test/inputs/schema/minmaxlength.schema b/test/inputs/schema/minmaxlength.schema
index 147e5e0e5..6a52399f0 100644
--- a/test/inputs/schema/minmaxlength.schema
+++ b/test/inputs/schema/minmaxlength.schema
@@ -12,7 +12,12 @@
     "minmaxlength": {
       "type": "string",
       "minLength": 3,
-      "maxLength": 5
+      "maxLength": 5,
+      "pattern": "^[a-z]+$"
+    },
+    "emptyOnly": {
+      "type": "string",
+      "maxLength": 0
     },
     "union": {
       "oneOf": [
@@ -71,6 +76,7 @@
     "minlength",
     "maxlength",
     "minmaxlength",
+    "emptyOnly",
     "union",
     "inUnion",
     "minMaxUnion",
diff --git a/test/inputs/schema/optional-constraints.1.json b/test/inputs/schema/optional-constraints.1.json
index 87fb17cf6..a070dc1f5 100644
--- a/test/inputs/schema/optional-constraints.1.json
+++ b/test/inputs/schema/optional-constraints.1.json
@@ -2,6 +2,6 @@
   "reqZeroMin": 0,
   "optInt": 0,
   "optDouble": 0.5,
-  "optString": "abc",
+  "optString": "abcdefghij",
   "optPattern": "abc"
 }
diff --git a/test/inputs/schema/optional-constraints.3.fail.minmaxlength.json b/test/inputs/schema/optional-constraints.3.fail.minmaxlength.json
new file mode 100644
index 000000000..8b032c690
--- /dev/null
+++ b/test/inputs/schema/optional-constraints.3.fail.minmaxlength.json
@@ -0,0 +1,4 @@
+{
+  "reqZeroMin": 0,
+  "optString": "abcdefghijk"
+}
diff --git a/test/inputs/schema/pattern.1.fail.pattern.json b/test/inputs/schema/pattern.1.fail.pattern.json
index a564c3fc2..e1ee6749f 100644
--- a/test/inputs/schema/pattern.1.fail.pattern.json
+++ b/test/inputs/schema/pattern.1.fail.pattern.json
@@ -1,5 +1,6 @@
 {
   "pattern1": "qqq",
   "pattern2": "ba",
+  "escaped": "123.abc",
   "union": "ccc"
 }
diff --git a/test/inputs/schema/pattern.1.json b/test/inputs/schema/pattern.1.json
index 7a82d4eca..f2efb7e7b 100644
--- a/test/inputs/schema/pattern.1.json
+++ b/test/inputs/schema/pattern.1.json
@@ -1,5 +1,6 @@
 {
   "pattern1": "aa",
   "pattern2": "ba",
+  "escaped": "123.abc",
   "union": "ccc"
 }
diff --git a/test/inputs/schema/pattern.2.fail.pattern.json b/test/inputs/schema/pattern.2.fail.pattern.json
new file mode 100644
index 000000000..7b7a22dc5
--- /dev/null
+++ b/test/inputs/schema/pattern.2.fail.pattern.json
@@ -0,0 +1,6 @@
+{
+  "pattern1": "aa",
+  "pattern2": "ba",
+  "escaped": "123.abc",
+  "union": "qqq"
+}
diff --git a/test/inputs/schema/pattern.3.fail.pattern.json b/test/inputs/schema/pattern.3.fail.pattern.json
new file mode 100644
index 000000000..33182aac9
--- /dev/null
+++ b/test/inputs/schema/pattern.3.fail.pattern.json
@@ -0,0 +1,6 @@
+{
+  "pattern1": "aa",
+  "pattern2": "ba",
+  "escaped": "abc.def",
+  "union": "ccc"
+}
diff --git a/test/inputs/schema/pattern.schema b/test/inputs/schema/pattern.schema
index 42154efba..8cc3a699c 100644
--- a/test/inputs/schema/pattern.schema
+++ b/test/inputs/schema/pattern.schema
@@ -9,6 +9,10 @@
       "type": "string",
       "pattern": "b[.]*"
     },
+    "escaped": {
+      "type": "string",
+      "pattern": "^[0-9]+\\.[a-z]+$"
+    },
     "union": {
       "oneOf": [
         {
@@ -21,5 +25,5 @@
       ]
     }
   },
-  "required": ["pattern1", "pattern2", "union"]
+  "required": ["pattern1", "pattern2", "escaped", "union"]
 }