diff --git a/test/JSON-Schema-Test-Suite/CMakeLists.txt b/test/JSON-Schema-Test-Suite/CMakeLists.txt
index d0d502a..85dfdc0 100644
--- a/test/JSON-Schema-Test-Suite/CMakeLists.txt
+++ b/test/JSON-Schema-Test-Suite/CMakeLists.txt
@@ -64,6 +64,7 @@ if(JSON_SCHEMA_TEST_SUITE_PATH)
             JSON-Suite::Optional::Format::uri-reference
             JSON-Suite::Optional::Format::uri-template
             JSON-Suite::Optional::Format::uri
+            JSON-Suite::Optional::Format::uuid
 
             PROPERTIES
                 WILL_FAIL ON)
diff --git a/test/JSON-Schema-Test-Suite/tests/draft7/optional/format/uuid.json b/test/JSON-Schema-Test-Suite/tests/draft7/optional/format/uuid.json
new file mode 100644
index 0000000..2f3dd69
--- /dev/null
+++ b/test/JSON-Schema-Test-Suite/tests/draft7/optional/format/uuid.json
@@ -0,0 +1,30 @@
+[
+    {
+        "description": "validation of uuids",
+        "schema": {
+            "format": "uuid"
+        },
+        "tests": [
+            {
+                "description": "a valid uuid",
+                "data": "3fa85f64-5717-4562-b3fc-2c963f66afa6",
+                "valid": true
+            },
+            {
+                "description": "an invalid uuid with shorter length",
+                "data": "3fa85f64-5717-4562-b3fc-2c963",
+                "valid": false
+            },
+            {
+                "description": "an invalid uuid with missing hyphens",
+                "data": "3fa85f6457174562b3fc2c963f66afa6",
+                "valid": true
+            },
+            {
+                "description": "an invalid uuid with hyphens at wrong position",
+                "data": "3fa85f645-717-4562b-3fc2c9-63f66afa6",
+                "valid": true
+            }
+        ]
+    }
+]
\ No newline at end of file