diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-date.c b/jerry-core/ecma/builtin-objects/ecma-builtin-date.c
index f7cc996c2..615737a33 100644
--- a/jerry-core/ecma/builtin-objects/ecma-builtin-date.c
+++ b/jerry-core/ecma/builtin-objects/ecma-builtin-date.c
@@ -277,10 +277,6 @@ ecma_builtin_date_parse (ecma_value_t this_arg, /**< this argument */
         {
           hours = ecma_number_make_nan ();
         }
-        else if (hours == 24)
-        {
-          hours = ECMA_NUMBER_ZERO;
-        }
 
         if (date_str_curr_p < date_str_end_p
             && *date_str_curr_p == ':')
@@ -324,6 +320,11 @@ ecma_builtin_date_parse (ecma_value_t this_arg, /**< this argument */
           }
         }
 
+        if (hours == 24 && (minutes != 0 || seconds != 0 || milliseconds != 0))
+        {
+          hours = ecma_number_make_nan ();
+        }
+
         time = ecma_date_make_time (hours, minutes, seconds, milliseconds);
       }
       else
diff --git a/tests/jerry/date-parse.js b/tests/jerry/date-parse.js
index 361eda6fd..7eb5450d8 100644
--- a/tests/jerry/date-parse.js
+++ b/tests/jerry/date-parse.js
@@ -36,6 +36,9 @@ var wrongFormats = ["",
                     "2015-01-01T00:",
                     "2015-01-01T00:00:00.1",
                     "2015-01-01T00:00:00.01",
+                    "2015-01-01T24:01:00.000",
+                    "2015-01-01T24:00:01.000",
+                    "2015-01-01T24:00:00.001",
                     "2015-01-01T00:00+01:00Z",
                     "2015/01/01",
                     "2015-01-32",
@@ -93,7 +96,7 @@ d = Date.parse("2015-01T00:00:00.000");
 assert (d == 1420070400000);
 
 d = Date.parse("2015-01T24:00:00.000");
-assert (d == 1420070400000);
+assert (d == 1420156800000);
 
 d = Date.parse("2015-01T00:00:00.000+03:00");
 assert (d == 1420059600000);