diff --git a/raml-parser-2/src/main/java/org/raml/v2/internal/impl/v10/type/TypeToJsonSchemaVisitor.java b/raml-parser-2/src/main/java/org/raml/v2/internal/impl/v10/type/TypeToJsonSchemaVisitor.java
index 840e5520..0f317971 100644
--- a/raml-parser-2/src/main/java/org/raml/v2/internal/impl/v10/type/TypeToJsonSchemaVisitor.java
+++ b/raml-parser-2/src/main/java/org/raml/v2/internal/impl/v10/type/TypeToJsonSchemaVisitor.java
@@ -42,6 +42,7 @@ public class TypeToJsonSchemaVisitor implements TypeVisitor<JsonObjectBuilder>
     private static final String INTEGER = "integer";
     private static final String NULL = "null";
     private static final String DATE_TIME = "date-time";
+    private static final String DATE_ONLY = "date";
     private static final String STRING = "string";
     private static final String BOOLEAN = "boolean";
     private static final String ARRAY = "array";
@@ -177,7 +178,7 @@ public JsonObjectBuilder visitDate(DateOnlyResolvedType dateOnlyTypeDefinition)
     {
         return this.factory.createObjectBuilder()
                            .add(TYPE, STRING)
-                           .add(FORMAT, DATE_TIME);
+                           .add(FORMAT, DATE_ONLY);
     }
 
     @Override
diff --git a/raml-parser-2/src/test/resources/org/raml/v2/api/v10/ref-in-trait/model.json b/raml-parser-2/src/test/resources/org/raml/v2/api/v10/ref-in-trait/model.json
index a30ed9bd..d69cad5b 100644
--- a/raml-parser-2/src/test/resources/org/raml/v2/api/v10/ref-in-trait/model.json
+++ b/raml-parser-2/src/test/resources/org/raml/v2/api/v10/ref-in-trait/model.json
@@ -140,21 +140,21 @@
                "name": "date-only",
                "parentTypes": [],
                "required": true,
-               "toJsonSchema": "{\"type\":\"string\",\"format\":\"date-time\",\"definitions\":{},\"$schema\":\"http://json-schema.org/draft-04/schema#\"}",
+               "toJsonSchema": "{\"type\":\"string\",\"format\":\"date\",\"definitions\":{},\"$schema\":\"http://json-schema.org/draft-04/schema#\"}",
                "toXmlSchema": "<schema xmlns=\"http://www.w3.org/2001/XMLSchema\" xmlns:tns=\"http://validationnamespace.raml.org\" attributeFormDefault=\"unqualified\" elementFormDefault=\"qualified\" targetNamespace=\"http://validationnamespace.raml.org\">\n    <element name=\"root\" type=\"date\"/>\n</schema>\n",
                "type": null,
                "xml": null
               }
              ],
              "required": false,
-             "toJsonSchema": "{\"type\":\"string\",\"format\":\"date-time\",\"definitions\":{},\"$schema\":\"http://json-schema.org/draft-04/schema#\"}",
+             "toJsonSchema": "{\"type\":\"string\",\"format\":\"date\",\"definitions\":{},\"$schema\":\"http://json-schema.org/draft-04/schema#\"}",
              "toXmlSchema": "<schema xmlns=\"http://www.w3.org/2001/XMLSchema\" xmlns:tns=\"http://validationnamespace.raml.org\" attributeFormDefault=\"unqualified\" elementFormDefault=\"qualified\" targetNamespace=\"http://validationnamespace.raml.org\">\n    <element name=\"release_date\" type=\"date\"/>\n</schema>\n",
              "type": "date-only",
              "xml": null
             }
            ],
            "required": true,
-           "toJsonSchema": "{\"$ref\":\"#/definitions/Release\",\"definitions\":{\"Release\":{\"type\":\"object\",\"properties\":{\"release_date\":{\"type\":\"string\",\"format\":\"date-time\"}}}},\"$schema\":\"http://json-schema.org/draft-04/schema#\"}",
+           "toJsonSchema": "{\"$ref\":\"#/definitions/Release\",\"definitions\":{\"Release\":{\"type\":\"object\",\"properties\":{\"release_date\":{\"type\":\"string\",\"format\":\"date\"}}}},\"$schema\":\"http://json-schema.org/draft-04/schema#\"}",
            "toXmlSchema": "<schema xmlns=\"http://www.w3.org/2001/XMLSchema\" xmlns:tns=\"http://validationnamespace.raml.org\" attributeFormDefault=\"unqualified\" elementFormDefault=\"qualified\" targetNamespace=\"http://validationnamespace.raml.org\">\n    <element name=\"Release\" type=\"tns:Release\"/>\n    <complexType name=\"Release\">\n        <sequence>\n            <element minOccurs=\"0\" name=\"release_date\" type=\"date\"/>\n            <any maxOccurs=\"unbounded\" minOccurs=\"0\" processContents=\"skip\"/>\n        </sequence>\n    </complexType>\n</schema>\n",
            "type": "object",
            "xml": null
@@ -187,21 +187,21 @@
              "name": "date-only",
              "parentTypes": [],
              "required": true,
-             "toJsonSchema": "{\"type\":\"string\",\"format\":\"date-time\",\"definitions\":{},\"$schema\":\"http://json-schema.org/draft-04/schema#\"}",
+             "toJsonSchema": "{\"type\":\"string\",\"format\":\"date\",\"definitions\":{},\"$schema\":\"http://json-schema.org/draft-04/schema#\"}",
              "toXmlSchema": "<schema xmlns=\"http://www.w3.org/2001/XMLSchema\" xmlns:tns=\"http://validationnamespace.raml.org\" attributeFormDefault=\"unqualified\" elementFormDefault=\"qualified\" targetNamespace=\"http://validationnamespace.raml.org\">\n    <element name=\"root\" type=\"date\"/>\n</schema>\n",
              "type": null,
              "xml": null
             }
            ],
            "required": false,
-           "toJsonSchema": "{\"type\":\"string\",\"format\":\"date-time\",\"definitions\":{},\"$schema\":\"http://json-schema.org/draft-04/schema#\"}",
+           "toJsonSchema": "{\"type\":\"string\",\"format\":\"date\",\"definitions\":{},\"$schema\":\"http://json-schema.org/draft-04/schema#\"}",
            "toXmlSchema": "<schema xmlns=\"http://www.w3.org/2001/XMLSchema\" xmlns:tns=\"http://validationnamespace.raml.org\" attributeFormDefault=\"unqualified\" elementFormDefault=\"qualified\" targetNamespace=\"http://validationnamespace.raml.org\">\n    <element name=\"release_date\" type=\"date\"/>\n</schema>\n",
            "type": "date-only",
            "xml": null
           }
          ],
          "required": true,
-         "toJsonSchema": "{\"$ref\":\"#/definitions/Release\",\"definitions\":{\"Release\":{\"type\":\"object\",\"properties\":{\"release_date\":{\"type\":\"string\",\"format\":\"date-time\"}}}},\"$schema\":\"http://json-schema.org/draft-04/schema#\"}",
+         "toJsonSchema": "{\"$ref\":\"#/definitions/Release\",\"definitions\":{\"Release\":{\"type\":\"object\",\"properties\":{\"release_date\":{\"type\":\"string\",\"format\":\"date\"}}}},\"$schema\":\"http://json-schema.org/draft-04/schema#\"}",
          "toXmlSchema": "<schema xmlns=\"http://www.w3.org/2001/XMLSchema\" xmlns:tns=\"http://validationnamespace.raml.org\" attributeFormDefault=\"unqualified\" elementFormDefault=\"qualified\" targetNamespace=\"http://validationnamespace.raml.org\">\n    <element name=\"Release\" type=\"tns:Release\"/>\n    <complexType name=\"Release\">\n        <sequence>\n            <element minOccurs=\"0\" name=\"release_date\" type=\"date\"/>\n            <any maxOccurs=\"unbounded\" minOccurs=\"0\" processContents=\"skip\"/>\n        </sequence>\n    </complexType>\n</schema>\n",
          "type": "Release",
          "xml": null
@@ -313,21 +313,21 @@
        "name": "date-only",
        "parentTypes": [],
        "required": true,
-       "toJsonSchema": "{\"type\":\"string\",\"format\":\"date-time\",\"definitions\":{},\"$schema\":\"http://json-schema.org/draft-04/schema#\"}",
+       "toJsonSchema": "{\"type\":\"string\",\"format\":\"date\",\"definitions\":{},\"$schema\":\"http://json-schema.org/draft-04/schema#\"}",
        "toXmlSchema": "<schema xmlns=\"http://www.w3.org/2001/XMLSchema\" xmlns:tns=\"http://validationnamespace.raml.org\" attributeFormDefault=\"unqualified\" elementFormDefault=\"qualified\" targetNamespace=\"http://validationnamespace.raml.org\">\n    <element name=\"root\" type=\"date\"/>\n</schema>\n",
        "type": null,
        "xml": null
       }
      ],
      "required": false,
-     "toJsonSchema": "{\"type\":\"string\",\"format\":\"date-time\",\"definitions\":{},\"$schema\":\"http://json-schema.org/draft-04/schema#\"}",
+     "toJsonSchema": "{\"type\":\"string\",\"format\":\"date\",\"definitions\":{},\"$schema\":\"http://json-schema.org/draft-04/schema#\"}",
      "toXmlSchema": "<schema xmlns=\"http://www.w3.org/2001/XMLSchema\" xmlns:tns=\"http://validationnamespace.raml.org\" attributeFormDefault=\"unqualified\" elementFormDefault=\"qualified\" targetNamespace=\"http://validationnamespace.raml.org\">\n    <element name=\"release_date\" type=\"date\"/>\n</schema>\n",
      "type": "date-only",
      "xml": null
     }
    ],
    "required": true,
-   "toJsonSchema": "{\"$ref\":\"#/definitions/Release\",\"definitions\":{\"Release\":{\"type\":\"object\",\"properties\":{\"release_date\":{\"type\":\"string\",\"format\":\"date-time\"}}}},\"$schema\":\"http://json-schema.org/draft-04/schema#\"}",
+   "toJsonSchema": "{\"$ref\":\"#/definitions/Release\",\"definitions\":{\"Release\":{\"type\":\"object\",\"properties\":{\"release_date\":{\"type\":\"string\",\"format\":\"date\"}}}},\"$schema\":\"http://json-schema.org/draft-04/schema#\"}",
    "toXmlSchema": "<schema xmlns=\"http://www.w3.org/2001/XMLSchema\" xmlns:tns=\"http://validationnamespace.raml.org\" attributeFormDefault=\"unqualified\" elementFormDefault=\"qualified\" targetNamespace=\"http://validationnamespace.raml.org\">\n    <element name=\"Release\" type=\"tns:Release\"/>\n    <complexType name=\"Release\">\n        <sequence>\n            <element minOccurs=\"0\" name=\"release_date\" type=\"date\"/>\n            <any maxOccurs=\"unbounded\" minOccurs=\"0\" processContents=\"skip\"/>\n        </sequence>\n    </complexType>\n</schema>\n",
    "type": "object",
    "xml": null