diff --git a/ext/date/php_date.c b/ext/date/php_date.c
index 40af3f92d9a..673cd041758 100644
--- a/ext/date/php_date.c
+++ b/ext/date/php_date.c
@@ -470,6 +470,7 @@ PHPAPI static void php_mktime(INTERNAL_FUNCTION_PARAMETERS, int gmt)
 			if (dst == 0 && tmp_offset->is_dst == 1) {
 				adjust_seconds = +3600;
 			}
+			timelib_time_offset_dtor(tmp_offset);
 		}
 	}
 	/* Clean up and return */
diff --git a/ext/date/tests/bug20382.phpt b/ext/date/tests/bug20382-1.phpt
similarity index 84%
rename from ext/date/tests/bug20382.phpt
rename to ext/date/tests/bug20382-1.phpt
index 4da8c211054..a259d934af1 100644
--- a/ext/date/tests/bug20382.phpt
+++ b/ext/date/tests/bug20382-1.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Bug #20382 (strtotime ("Monday", $date) produces wrong result on DST changeover)
+Bug #20382 [1] (strtotime ("Monday", $date) produces wrong result on DST changeover)
 --FILE--
 <?php
 	putenv("TZ=Europe/Amsterdam");
diff --git a/ext/standard/tests/time/bug21966.phpt b/ext/date/tests/bug21966.phpt
similarity index 100%
rename from ext/standard/tests/time/bug21966.phpt
rename to ext/date/tests/bug21966.phpt
diff --git a/ext/standard/tests/time/bug27719.phpt b/ext/date/tests/bug27719.phpt
similarity index 96%
rename from ext/standard/tests/time/bug27719.phpt
rename to ext/date/tests/bug27719.phpt
index cff6fdd2fe5..6f65bfb85e0 100644
--- a/ext/standard/tests/time/bug27719.phpt
+++ b/ext/date/tests/bug27719.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Bug #27719: mktime returns incorrect timestamp for dst days
+Bug #27719 (mktime returns incorrect timestamp for dst days)
 --INI--
 error_reporting=2047
 --FILE--
diff --git a/ext/standard/tests/time/003.phpt b/ext/date/tests/mktime-1.phpt
similarity index 100%
rename from ext/standard/tests/time/003.phpt
rename to ext/date/tests/mktime-1.phpt
diff --git a/ext/standard/tests/time/mktime.phpt b/ext/date/tests/mktime-2.phpt
similarity index 100%
rename from ext/standard/tests/time/mktime.phpt
rename to ext/date/tests/mktime-2.phpt