diff --git a/tests/draft6/exclusiveMaximum.json b/tests/draft6/exclusiveMaximum.json
new file mode 100644
index 00000000..dc3cd709
--- /dev/null
+++ b/tests/draft6/exclusiveMaximum.json
@@ -0,0 +1,30 @@
+[
+    {
+        "description": "exclusiveMaximum validation",
+        "schema": {
+            "exclusiveMaximum": 3.0
+        },
+        "tests": [
+            {
+                "description": "below the exclusiveMaximum is valid",
+                "data": 2.2,
+                "valid": true
+            },
+            {
+                "description": "boundary point is invalid",
+                "data": 3.0,
+                "valid": false
+            },
+            {
+                "description": "above the exclusiveMaximum is invalid",
+                "data": 3.5,
+                "valid": false
+            },
+            {
+                "description": "ignores non-numbers",
+                "data": "x",
+                "valid": true
+            }
+        ]
+    }
+]
diff --git a/tests/draft6/exclusiveMinimum.json b/tests/draft6/exclusiveMinimum.json
new file mode 100644
index 00000000..b38d7ece
--- /dev/null
+++ b/tests/draft6/exclusiveMinimum.json
@@ -0,0 +1,30 @@
+[
+    {
+        "description": "exclusiveMinimum validation",
+        "schema": {
+            "exclusiveMinimum": 1.1
+        },
+        "tests": [
+            {
+                "description": "above the exclusiveMinimum is valid",
+                "data": 1.2,
+                "valid": true
+            },
+            {
+                "description": "boundary point is invalid",
+                "data": 1.1,
+                "valid": false
+            },
+            {
+                "description": "below the exclusiveMinimum is invalid",
+                "data": 0.6,
+                "valid": false
+            },
+            {
+                "description": "ignores non-numbers",
+                "data": "x",
+                "valid": true
+            }
+        ]
+    }
+]
diff --git a/tests/draft6/maximum.json b/tests/draft6/maximum.json
index 86c7b89c..8150984e 100644
--- a/tests/draft6/maximum.json
+++ b/tests/draft6/maximum.json
@@ -8,6 +8,11 @@
                 "data": 2.6,
                 "valid": true
             },
+            {
+                "description": "boundary point is valid",
+                "data": 3.0,
+                "valid": true
+            },
             {
                 "description": "above the maximum is invalid",
                 "data": 3.5,
@@ -19,24 +24,5 @@
                 "valid": true
             }
         ]
-    },
-    {
-        "description": "exclusiveMaximum validation",
-        "schema": {
-            "maximum": 3.0,
-            "exclusiveMaximum": true
-        },
-        "tests": [
-            {
-                "description": "below the maximum is still valid",
-                "data": 2.2,
-                "valid": true
-            },
-            {
-                "description": "boundary point is invalid",
-                "data": 3.0,
-                "valid": false
-            }
-        ]
     }
 ]
diff --git a/tests/draft6/minimum.json b/tests/draft6/minimum.json
index d5bf000b..bd1e95bc 100644
--- a/tests/draft6/minimum.json
+++ b/tests/draft6/minimum.json
@@ -8,6 +8,11 @@
                 "data": 2.6,
                 "valid": true
             },
+            {
+                "description": "boundary point is valid",
+                "data": 1.1,
+                "valid": true
+            },
             {
                 "description": "below the minimum is invalid",
                 "data": 0.6,
@@ -19,24 +24,5 @@
                 "valid": true
             }
         ]
-    },
-    {
-        "description": "exclusiveMinimum validation",
-        "schema": {
-            "minimum": 1.1,
-            "exclusiveMinimum": true
-        },
-        "tests": [
-            {
-                "description": "above the minimum is still valid",
-                "data": 1.2,
-                "valid": true
-            },
-            {
-                "description": "boundary point is invalid",
-                "data": 1.1,
-                "valid": false
-            }
-        ]
     }
 ]