diff --git a/hphp/test/ext/test_ext.h b/hphp/test/ext/test_ext.h
index 5e130fa11..794d920de 100644
--- a/hphp/test/ext/test_ext.h
+++ b/hphp/test/ext/test_ext.h
@@ -37,7 +37,6 @@
 #include "hphp/test/ext/test_ext_bcmath.h"
 #include "hphp/test/ext/test_ext_bzip2.h"
 #include "hphp/test/ext/test_ext_curl.h"
-#include "hphp/test/ext/test_ext_datetime.h"
 #include "hphp/test/ext/test_ext_debugger.h"
 #include "hphp/test/ext/test_ext_domdocument.h"
 #include "hphp/test/ext/test_ext_error.h"
diff --git a/hphp/test/ext/test_ext_datetime.cpp b/hphp/test/ext/test_ext_datetime.cpp
deleted file mode 100644
index 6c9341878..000000000
--- a/hphp/test/ext/test_ext_datetime.cpp
+++ /dev/null
@@ -1,721 +0,0 @@
-/*
-   +----------------------------------------------------------------------+
-   | HipHop for PHP                                                       |
-   +----------------------------------------------------------------------+
-   | Copyright (c) 2010-2013 Facebook, Inc. (http://www.facebook.com)     |
-   +----------------------------------------------------------------------+
-   | This source file is subject to version 3.01 of the PHP license,      |
-   | that is bundled with this package in the file LICENSE, and is        |
-   | available through the world-wide-web at the following url:           |
-   | http://www.php.net/license/3_01.txt                                  |
-   | If you did not receive a copy of the PHP license and are unable to   |
-   | obtain it through the world-wide-web, please send a note to          |
-   | license@php.net so we can mail you a copy immediately.               |
-   +----------------------------------------------------------------------+
-*/
-
-#include "hphp/test/ext/test_ext_datetime.h"
-#include "hphp/runtime/ext/ext_datetime.h"
-#include "hphp/runtime/ext/ext_string.h"
-
-///////////////////////////////////////////////////////////////////////////////
-
-bool TestExtDatetime::RunTests(const std::string &which) {
-  bool ret = true;
-
-  RUN_TEST(test_checkdate);
-  RUN_TEST(test_date_add);
-  RUN_TEST(test_date_create_from_format);
-  RUN_TEST(test_date_create);
-  RUN_TEST(test_date_date_set);
-  RUN_TEST(test_date_default_timezone_get);
-  RUN_TEST(test_date_default_timezone_set);
-  RUN_TEST(test_date_diff);
-  RUN_TEST(test_date_format);
-  RUN_TEST(test_date_get_last_errors);
-  RUN_TEST(test_date_interval_create_from_date_string);
-  RUN_TEST(test_date_interval_format);
-  RUN_TEST(test_date_isodate_set);
-  RUN_TEST(test_date_modify);
-  RUN_TEST(test_date_offset_get);
-  RUN_TEST(test_date_parse);
-  RUN_TEST(test_date_sub);
-  RUN_TEST(test_date_sun_info);
-  RUN_TEST(test_date_sunrise);
-  RUN_TEST(test_date_sunset);
-  RUN_TEST(test_date_time_set);
-  RUN_TEST(test_date_timestamp_get);
-  RUN_TEST(test_date_timestamp_set);
-  RUN_TEST(test_date_timezone_get);
-  RUN_TEST(test_date_timezone_set);
-  RUN_TEST(test_date);
-  RUN_TEST(test_getdate);
-  RUN_TEST(test_gettimeofday);
-  RUN_TEST(test_gmdate);
-  RUN_TEST(test_gmmktime);
-  RUN_TEST(test_gmstrftime);
-  RUN_TEST(test_idate);
-  RUN_TEST(test_localtime);
-  RUN_TEST(test_microtime);
-  RUN_TEST(test_mktime);
-  RUN_TEST(test_strftime);
-  RUN_TEST(test_strptime);
-  RUN_TEST(test_strtotime);
-  RUN_TEST(test_time);
-  RUN_TEST(test_timezone_abbreviations_list);
-  RUN_TEST(test_timezone_identifiers_list);
-  RUN_TEST(test_timezone_location_get);
-  RUN_TEST(test_timezone_name_from_abbr);
-  RUN_TEST(test_timezone_name_get);
-  RUN_TEST(test_timezone_offset_get);
-  RUN_TEST(test_timezone_open);
-  RUN_TEST(test_timezone_transitions_get);
-  RUN_TEST(test_timezone_version_get);
-
-  return ret;
-}
-
-#define VDT(dt, s) VS(f_date_format(dt, "Y-m-d H:i:s"), s)
-
-/* Ignore unimplemented datetime features when timelib is old */
-#define TIMELIB_TEST_UNIMPL(minver, exp) try { exp } \
-  catch (const NotImplementedException& e) { \
-    return Count(f_timezone_version_get().toDouble() < minver); \
-  }
-
-///////////////////////////////////////////////////////////////////////////////
-
-bool TestExtDatetime::test_checkdate() {
-  VERIFY(f_checkdate(12, 31, 2000));
-  VERIFY(!f_checkdate(2, 29, 2001));
-  return Count(true);
-}
-
-bool TestExtDatetime::test_date_add() {
-  TIMELIB_TEST_UNIMPL(2011.1,
-    Object datetime = f_date_create("2010-08-16");
-    Object interval = f_date_interval_create_from_date_string("2 weeks");
-    Object dt2 = f_date_add(datetime, interval);
-    VDT(dt2, "2010-08-30 00:00:00");
-    return Count(true);
-  );
-}
-
-bool TestExtDatetime::test_date_create_from_format() {
-  TIMELIB_TEST_UNIMPL(2011.1,
-    Object dt = f_date_create_from_format("d/m/Y H:i:s", "16/08/2012 00:00:00");
-    VDT(dt, "2012-08-16 00:00:00");
-    return Count(true);
-  );
-}
-
-bool TestExtDatetime::test_date_create() {
-  VDT(f_date_create("2006-12-12"),  "2006-12-12 00:00:00");
-  VDT(f_date_create("@1170288001"), "2007-02-01 00:00:01");
-  return Count(true);
-}
-
-bool TestExtDatetime::test_date_date_set() {
-  Object dt = f_date_create("2006-12-12 12:34:56");
-  f_date_date_set(dt, 2007, 11, 23);
-  VDT(dt, "2007-11-23 12:34:56");
-  return Count(true);
-}
-
-bool TestExtDatetime::test_date_default_timezone_get() {
-  VS(f_date_default_timezone_get(), "America/Los_Angeles");
-  return Count(true);
-}
-
-bool TestExtDatetime::test_date_default_timezone_set() {
-  VERIFY(f_date_default_timezone_set("Asia/Shanghai"));
-  VS(f_date_default_timezone_get(), "Asia/Shanghai");
-  VERIFY(f_date_default_timezone_set("America/Los_Angeles"));
-  VS(f_date_default_timezone_get(), "America/Los_Angeles");
-  return Count(true);
-}
-
-bool TestExtDatetime::test_date_diff() {
-  TIMELIB_TEST_UNIMPL(2011.1,
-    Object dt1 = f_date_create("2010-08-02");
-    Object dt2 = f_date_create("2010-08-30");
-    Object interval = f_date_diff(dt1, dt2, true);
-    VS(f_date_interval_format(interval, "%d"), "28");
-    return Count(true);
-  );
-}
-
-bool TestExtDatetime::test_date_format() {
-  Object dt = f_date_create("@1170288001");
-  VS(f_date_format(dt, "Y-m-d\\TH:i:s\\Z"), "2007-02-01T00:00:01Z");
-  VS(f_date_format(dt, "Y-m-d H:i:sZ"), "2007-02-01 00:00:01-28800");
-  VS(DateTime(1255494072, true).toString(DateTime::Cookie),
-     "Wed, 14-Oct-2009 04:21:12 GMT");
-  return Count(true);
-}
-
-static const StaticString
-  s_warning_count("warning_count"),
-  s_error_count("error_count"),
-  s_warnings("warnings"),
-  s_errors("errors"),
-  s_sec("sec");
-
-bool TestExtDatetime::test_date_get_last_errors() {
-  Object dt = f_date_create("asdfasdf");
-  Array errs = f_date_get_last_errors();
-  VS(errs.size(), 4);
-
-  VS(errs[s_warning_count], 1);
-  Array err_warnings = errs[s_warnings];
-  VS(err_warnings.size(), 1);
-  VS(err_warnings[6], "Double timezone specification");
-
-  VS(errs[s_error_count], 1);
-  Array err_errors = errs[s_errors];
-  VS(err_errors.size(), 1);
-  VS(err_errors[0], "The timezone could not be found in the database");
-
-  return Count(true);
-}
-
-bool TestExtDatetime::test_date_interval_create_from_date_string() {
-  TIMELIB_TEST_UNIMPL(2011.1,
-    Object interval = f_date_interval_create_from_date_string("2 weeks");
-    VS(f_date_interval_format(interval, "%d"), "14");
-    return Count(true);
-  );
-}
-
-bool TestExtDatetime::test_date_interval_format() {
-  // Covered by test_date_interval_create_from_string, above
-  return Count(true);
-}
-
-bool TestExtDatetime::test_date_isodate_set() {
-  Object dt = f_date_create("2008-08-08 00:00:00");
-  f_date_isodate_set(dt, 2007, 35, 3);
-  VDT(dt, "2007-08-29 00:00:00");
-  return Count(true);
-}
-
-bool TestExtDatetime::test_date_modify() {
-  Object dt = f_date_create("2006-12-12 00:00:00");
-  f_date_modify(dt, "+1 day");
-  VDT(dt, "2006-12-13 00:00:00");
-  return Count(true);
-}
-
-bool TestExtDatetime::test_date_offset_get() {
-  VS(f_date_offset_get(f_date_create("2006-12-12")), -28800);
-  VS(f_date_offset_get(f_date_create("2008-08-08")), -25200);
-  return Count(true);
-}
-
-bool TestExtDatetime::test_date_parse() {
-  VS(f_print_r(f_date_parse("2006-12-12 10:00:00.5"), true),
-     "Array\n"
-     "(\n"
-     "    [year] => 2006\n"
-     "    [month] => 12\n"
-     "    [day] => 12\n"
-     "    [hour] => 10\n"
-     "    [minute] => 0\n"
-     "    [second] => 0\n"
-     "    [fraction] => 0.5\n"
-     "    [warning_count] => 0\n"
-     "    [warnings] => Array\n"
-     "        (\n"
-     "        )\n"
-     "\n"
-     "    [error_count] => 0\n"
-     "    [errors] => Array\n"
-     "        (\n"
-     "        )\n"
-     "\n"
-     "    [is_localtime] => \n"
-     ")\n");
-  return Count(true);
-}
-
-bool TestExtDatetime::test_date_sub() {
-  TIMELIB_TEST_UNIMPL(2011.1,
-    Object datetime = f_date_create("2010-08-16");
-    Object interval = f_date_interval_create_from_date_string("2 weeks");
-    Object dt2 = f_date_sub(datetime, interval);
-    VS(f_date_format(dt2, "Y-m-d"), "2010-08-02");
-    return Count(true);
-  );
-}
-
-bool TestExtDatetime::test_date_sun_info() {
-  VS(f_print_r(f_date_sun_info(f_strtotime("2006-12-12"), 31.7667, 35.2333),
-               true),
-     "Array\n"
-     "(\n"
-     "    [sunrise] => 1165897795\n"
-     "    [sunset] => 1165934173\n"
-     "    [transit] => 1165915984\n"
-     "    [civil_twilight_begin] => 1165896189\n"
-     "    [civil_twilight_end] => 1165935779\n"
-     "    [nautical_twilight_begin] => 1165894366\n"
-     "    [nautical_twilight_end] => 1165937603\n"
-     "    [astronomical_twilight_begin] => 1165892582\n"
-     "    [astronomical_twilight_end] => 1165939386\n"
-     ")\n");
-  return Count(true);
-}
-
-bool TestExtDatetime::test_date_sunrise() {
-  /*
-   * calculate the sunrise time for Lisbon, Portugal
-   * Latitude: 38.4 North
-   * Longitude: 9 West
-   * Zenith ~= 90
-   * offset: +1 GMT
-   */
-  VS(f_date_sunrise(f_strtotime("2004-12-20"), k_SUNFUNCS_RET_STRING,
-                    38.4, -9, 90, 1), "08:52");
-  return Count(true);
-}
-
-bool TestExtDatetime::test_date_sunset() {
-  /*
-   * calculate the sunset time for Lisbon, Portugal
-   * Latitude: 38.4 North
-   * Longitude: 9 West
-   * Zenith ~= 90
-   * offset: +1 GMT
-   */
-  VS(f_date_sunset(f_strtotime("2004-12-20"), k_SUNFUNCS_RET_STRING,
-                   38.4, -9, 90, 1), "18:15");
-  return Count(true);
-}
-
-bool TestExtDatetime::test_date_time_set() {
-  Object dt = f_date_create("2006-12-12 12:34:56");
-  f_date_time_set(dt, 23, 45, 12);
-  VDT(dt, "2006-12-12 23:45:12");
-  return Count(true);
-}
-
-bool TestExtDatetime::test_date_timestamp_get() {
-  Object tz = f_timezone_open("America/Los_Angeles");
-  Object dt = f_date_create("2008-08-08 12:34:56", tz);
-  VS(f_date_timestamp_get(dt), 1218224096);
-  return Count(true);
-}
-
-bool TestExtDatetime::test_date_timestamp_set() {
-  Object tz = f_timezone_open("America/Los_Angeles");
-  Object dt = f_date_create("2008-08-08 12:34:56", tz);
-  f_date_timestamp_set(dt, 1000000000);
-  VS(f_date_format(dt, "Y-m-d H:i:s"), "2001-09-08 18:46:40");
-  return Count(true);
-}
-
-bool TestExtDatetime::test_date_timezone_get() {
-  Object dt = f_date_create("2008-08-08 12:34:56");
-  VS(f_timezone_name_get(f_date_timezone_get(dt)), "America/Los_Angeles");
-  return Count(true);
-}
-
-bool TestExtDatetime::test_date_timezone_set() {
-  Object dt = f_date_create("2008-08-08 12:34:56");
-  f_date_timezone_set(dt, f_timezone_open("Asia/Shanghai"));
-  VS(f_timezone_name_get(f_date_timezone_get(dt)), "Asia/Shanghai");
-  VDT(dt, "2008-08-09 03:34:56");
-  return Count(true);
-}
-
-bool TestExtDatetime::test_date() {
-  int d = f_strtotime("2008-09-10 12:34:56");
-
-  VS(f_date("l", d), "Wednesday");
-
-  VS(f_date("l jS \\of F Y h:i:s A", d),
-     "Wednesday 10th of September 2008 12:34:56 PM");
-
-  VS(f_date("l", f_mktime(0, 0, 0, 7, 1, 2000)), "Saturday");
-
-  VS(f_date(k_DATE_RFC822, d), "Wed, 10 Sep 08 12:34:56 -0700");
-
-  VS(f_date(k_DATE_ATOM, f_mktime(0, 0, 0, 7, 1, 2000)),
-     "2000-07-01T00:00:00-07:00");
-
-  VS(f_date("l \\t\\h\\e jS", d), "Wednesday the 10th");
-
-  int tomorrow = f_mktime(0,0,0,
-                          f_date("m", d).toInt32(),
-                          f_date("d", d).toInt32() + 1,
-                          f_date("Y", d).toInt32());
-  VS(tomorrow, 1221116400);
-
-  int lastmonth = f_mktime(0,0,0,
-                           f_date("m", d).toInt32() - 1,
-                           f_date("d", d).toInt32(),
-                           f_date("Y", d).toInt32());
-  VS(lastmonth, 1218351600);
-
-  int nextyear = f_mktime(0,0,0,
-                          f_date("m", d).toInt32(),
-                          f_date("d", d).toInt32(),
-                          f_date("Y", d).toInt32() + 1);
-  VS(nextyear, 1252566000);
-
-  d = f_strtotime("2001-03-10 05:16:18");
-  VS(f_date("F j, Y, g:i a", d), "March 10, 2001, 5:16 am");
-  VS(f_date("m.d.y", d), "03.10.01");
-  VS(f_date("j, n, Y", d), "10, 3, 2001");
-  VS(f_date("Ymd", d), "20010310");
-  VS(f_date("h-i-s, j-m-y, it is w Day z ", d),
-     "05-16-18, 10-03-01, 1631 1618 6 Satam01 68 ");
-  VS(f_date("\\i\\t \\i\\s \\t\\h\\e jS \\d\\a\\y.", d),
-     "it is the 10th day.");
-  VS(f_date("D M j G:i:s T Y", d), "Sat Mar 10 5:16:18 PST 2001");
-  VS(f_date("H:m:s \\m \\i\\s\\ \\m\\o\\n\\t\\h", d), "05:03:18 m is month");
-  VS(f_date("H:i:s", d), "05:16:18");
-
-  d = f_strtotime("1955-03-10 05:16:18");
-  VS(f_date("Ymd", d), "19550310");
-
-  VS(f_date("r", -5000000000LL), "Tue, 23 Jul 1811 07:06:40 -0800");
-
-  VS(f_mktime(0, 0, 0, 2, 26 - 91, 2010), 1259308800);
-
-  return Count(true);
-}
-
-bool TestExtDatetime::test_getdate() {
-  int d = f_strtotime("2008-09-10 12:34:56");
-
-  Array today = f_getdate(d);
-  VS(f_print_r(today, true),
-     "Array\n"
-     "(\n"
-     "    [seconds] => 56\n"
-     "    [minutes] => 34\n"
-     "    [hours] => 12\n"
-     "    [mday] => 10\n"
-     "    [wday] => 3\n"
-     "    [mon] => 9\n"
-     "    [year] => 2008\n"
-     "    [yday] => 253\n"
-     "    [weekday] => Wednesday\n"
-     "    [month] => September\n"
-     "    [0] => 1221075296\n"
-     ")\n");
-
-  return Count(true);
-}
-
-bool TestExtDatetime::test_gettimeofday() {
-  Array ret = f_gettimeofday();
-  VS(ret.size(), 4);
-  VERIFY(more(ret[s_sec], 1073504408));
-
-  VERIFY(more(f_gettimeofday(true), 1073504408.23910));
-  return Count(true);
-}
-
-bool TestExtDatetime::test_gmdate() {
-  int d = f_mktime(0, 0, 0, 1, 1, 1998);
-  VS(f_date("M d Y H:i:s",   d), "Jan 01 1998 00:00:00");
-  VS(f_gmdate("M d Y H:i:s", d), "Jan 01 1998 08:00:00");
-  return Count(true);
-}
-
-bool TestExtDatetime::test_gmmktime() {
-  int d = f_gmmktime(0, 0, 0, 1, 1, 1998);
-  VS(f_date("M d Y H:i:s",   d), "Dec 31 1997 16:00:00");
-  VS(f_gmdate("M d Y H:i:s", d), "Jan 01 1998 00:00:00");
-  return Count(true);
-}
-
-bool TestExtDatetime::test_gmstrftime() {
-  f_setlocale(2, k_LC_TIME, "en_US.utf8");
-  int d = f_mktime(20, 0, 0, 12, 31, 98);
-  VS(f_strftime("%b %d %Y %H:%M:%S", d),   "Dec 31 1998 20:00:00");
-  VS(f_gmstrftime("%b %d %Y %H:%M:%S", d), "Jan 01 1999 04:00:00");
-  int t = f_mktime(0,0,0, 6, 27, 2006);
-  VS(f_strftime("%a %A %b %B %c %C %d %D %e %g %G %h %H %I %j %m %M %n %p "
-                "%r %R %S %t %T %u %U %V %W %w %x %X %y %Y %Z %z %%", t),
-                "Tue Tuesday Jun June Tue 27 Jun 2006 12:00:00 AM PDT 20 27 "
-                "06/27/06 27 06 2006 Jun 00 12 178 06 00 \n AM 12:00:00 AM "
-                "00:00 00 \t 00:00:00 2 26 26 26 2 06/27/2006 12:00:00 AM "
-                "06 2006 PDT -0700 %");
-  return Count(true);
-}
-
-bool TestExtDatetime::test_idate() {
-  int timestamp = f_strtotime("1st January 2004"); //1072915200
-
-  // this prints the year in a two digit format
-  // however, as this would start with a "0", it
-  // only prints "4"
-  VS(f_idate("y", timestamp), 4);
-  return Count(true);
-}
-
-bool TestExtDatetime::test_localtime() {
-  int d = f_strtotime("2008-09-10 12:34:56");
-
-  Array localtime = f_localtime(d);
-  Array localtime_assoc = f_localtime(d, true);
-  VS(f_print_r(localtime, true),
-     "Array\n"
-     "(\n"
-     "    [0] => 56\n"
-     "    [1] => 34\n"
-     "    [2] => 12\n"
-     "    [3] => 10\n"
-     "    [4] => 8\n"
-     "    [5] => 108\n"
-     "    [6] => 3\n"
-     "    [7] => 253\n"
-     "    [8] => 1\n"
-     ")\n");
-
-  VS(f_print_r(localtime_assoc, true),
-     "Array\n"
-     "(\n"
-     "    [tm_sec] => 56\n"
-     "    [tm_min] => 34\n"
-     "    [tm_hour] => 12\n"
-     "    [tm_mday] => 10\n"
-     "    [tm_mon] => 8\n"
-     "    [tm_year] => 108\n"
-     "    [tm_wday] => 3\n"
-     "    [tm_yday] => 253\n"
-     "    [tm_isdst] => 1\n"
-     ")\n");
-
-  return Count(true);
-}
-
-bool TestExtDatetime::test_microtime() {
-  int time_start = f_microtime(true);
-  VERIFY(time_start > 0);
-  return Count(true);
-}
-
-bool TestExtDatetime::test_mktime() {
-  int lastday = f_mktime(0, 0, 0, 3, 0, 2000);
-  VS(f_strftime("Last day in Feb 2000 is: %d", lastday),
-     "Last day in Feb 2000 is: 29");
-
-  /**
-   * We are not supporting negative parameters
-   * lastday = f_mktime(0, 0, 0, 4, -31, 2000);
-   * VS(f_strftime("Last day in Feb 2000 is: %d", lastday),
-   *    "Last day in Feb 2000 is: 29");
-   */
-
-  VS(f_date("M-d-Y", f_mktime(0, 0, 0, 12, 32, 1997)), "Jan-01-1998");
-  VS(f_date("M-d-Y", f_mktime(0, 0, 0, 13, 1, 1997)),  "Jan-01-1998");
-  VS(f_date("M-d-Y", f_mktime(0, 0, 0, 1, 1, 1998)),   "Jan-01-1998");
-  VS(f_date("M-d-Y", f_mktime(0, 0, 0, 1, 1, 98)),     "Jan-01-1998");
-  VS(f_date("M-d-Y", f_mktime(0, 0, 0, 1, 1, 1900)),   "Jan-01-1900");
-  VS(f_date("M-d-Y", f_mktime(0, 0, 0, 1, 1, 2100)),   "Jan-01-2100");
-  VS(f_date("M-d-Y", f_mktime(0, 0, 0, 1, 1, 110)),    "Jan-01-0110");
-
-  VS(f_mktime(), time(nullptr));
-
-  VS(f_date("h", f_mktime(9)), "09");
-
-  return Count(true);
-}
-
-bool TestExtDatetime::test_strftime() {
-  int ts = f_mktime(0, 0, 0, 8, 5, 1998);
-
-  f_setlocale(2, k_LC_TIME, "C");
-  VS(f_strftime("%A", ts), "Wednesday");
-
-  if (f_setlocale(2, k_LC_TIME, "fi_FI")) {
-    VS(f_strftime(" in Finnish is %A,", ts), " in Finnish is keskiviikko,");
-  } else {
-    SKIP("setlocale() failed");
-  }
-
-  if (f_setlocale(2, k_LC_TIME, "fr_FR")) {
-    VS(f_strftime(" in French %A and", ts), " in French mercredi and");
-  } else {
-    SKIP("setlocale() failed");
-  }
-
-  if (f_setlocale(2, k_LC_TIME, "de_DE")) {
-    VS(f_strftime(" in German %A.", ts), " in German Mittwoch.");
-  } else {
-    SKIP("setlocale() failed");
-  }
-
-  f_setlocale(2, k_LC_TIME, "C");
-
-/*
-  December 2002 / January 2003
-  ISOWk  M   Tu  W   Thu F   Sa  Su
-  ----- ----------------------------
-  51     16  17  18  19  20  21  22
-  52     23  24  25  26  27  28  29
-  1      30  31   1   2   3   4   5
-  2       6   7   8   9  10  11  12
-  3      13  14  15  16  17  18  19
-*/
-  VS(f_strftime("%V,%G,%Y", f_strtotime("12/28/2002")), "52,2002,2002");
-  VS(f_strftime("%V,%G,%Y", f_strtotime("12/30/2002")), "01,2003,2002");
-  VS(f_strftime("%V,%G,%Y", f_strtotime("1/3/2003")),   "01,2003,2003");
-  VS(f_strftime("%V,%G,%Y", f_strtotime("1/10/2003")),  "02,2003,2003");
-
-/*
-  December 2004 / January 2005
-  ISOWk  M   Tu  W   Thu F   Sa  Su
-  ----- ----------------------------
-  51     13  14  15  16  17  18  19
-  52     20  21  22  23  24  25  26
-  53     27  28  29  30  31   1   2
-  1       3   4   5   6   7   8   9
-  2      10  11  12  13  14  15  16
-*/
-  VS(f_strftime("%V,%G,%Y", f_strtotime("12/23/2004")), "52,2004,2004");
-  VS(f_strftime("%V,%G,%Y", f_strtotime("12/31/2004")), "53,2004,2004");
-  VS(f_strftime("%V,%G,%Y", f_strtotime("1/2/2005")),   "53,2004,2005");
-  VS(f_strftime("%V,%G,%Y", f_strtotime("1/3/2005")),   "01,2005,2005");
-
-  return Count(true);
-}
-
-bool TestExtDatetime::test_strptime() {
-  String format = "%d/%m/%Y %H:%M:%S";
-  String strf = f_strftime(format, f_strtotime("10/03/2004 15:54:19"));
-  VS(strf, "03/10/2004 15:54:19");
-  VS(f_print_r(f_strptime(strf, format), true),
-     "Array\n"
-     "(\n"
-     "    [tm_sec] => 19\n"
-     "    [tm_min] => 54\n"
-     "    [tm_hour] => 15\n"
-     "    [tm_mday] => 3\n"
-     "    [tm_mon] => 9\n"
-     "    [tm_year] => 104\n"
-     "    [tm_wday] => 0\n"
-     "    [tm_yday] => 276\n"
-     "    [unparsed] => \n"
-     ")\n");
-
-  return Count(true);
-}
-
-bool TestExtDatetime::test_strtotime() {
-  VERIFY(more(f_strtotime("now"), 0));
-  VS(f_strtotime("10 September 2000"), 968569200);
-  VS(f_strtotime("+1 day", 968569200), 968655600);
-  VS(f_strtotime("+1 week", 968569200), 969174000);
-  VS(f_strtotime("+1 week 2 days 4 hours 2 seconds", 968569200), 969361202);
-  VS(f_strtotime("next Thursday", 968569200), 968914800);
-  VS(f_strtotime("last Monday", 968569200), 968050800);
-
-  String str = "Not Good";
-  Variant timestamp = f_strtotime(str);
-  VERIFY(same(timestamp, false));
-  VERIFY(same(f_strtotime(""), false));
-  return Count(true);
-}
-
-bool TestExtDatetime::test_time() {
-  // XXX This test fails between 12:00AM and 12:59AM on 10/31/11 - 11/6/11
-  // and between 11:00PM and 11:59PM on 3/6/11 - 3/12/11, we should fix this.
-  // This issue appears to have something to do with how strtotime() handles
-  // daylight savings time.
-  int nextWeek = f_time() + (7 * 24 * 60 * 60);
-  VS(f_date("Y-m-d", nextWeek),
-     f_date("Y-m-d", f_strtotime("+1 week")));
-  return Count(true);
-}
-
-bool TestExtDatetime::test_timezone_abbreviations_list() {
-  //f_var_dump(TimeZone::GetAbbreviations());
-  VERIFY(!TimeZone::GetAbbreviations().empty());
-  return Count(true);
-}
-
-bool TestExtDatetime::test_timezone_identifiers_list() {
-  //f_var_dump(TimeZone::GetNames());
-  VERIFY(!TimeZone::GetNames().empty());
-  return Count(true);
-}
-
-static const StaticString
-  s_country_code("country_code"),
-  s_latitude("latitude"),
-  s_longitude("longitude"),
-  s_comments("comments");
-
-bool TestExtDatetime::test_timezone_location_get() {
-  TIMELIB_TEST_UNIMPL(2011.1,
-    Object tz = f_timezone_open("Europe/Prague");
-    Array loc = f_timezone_location_get(tz);
-    VS(loc.size(), 4);
-    VS(loc[s_country_code].toString(), "CZ");
-    VS((int)(loc[s_latitude].toDoubleVal() * 100), 5008);
-    VS((int)(loc[s_longitude].toDoubleVal() * 100), 1443);
-    VS(loc[s_comments].toString(), "");
-    return Count(true);
-  );
-}
-
-bool TestExtDatetime::test_timezone_name_from_abbr() {
-  VS(f_timezone_name_from_abbr("CET"), "Europe/Berlin");
-  VS(f_timezone_name_from_abbr("", 3600, 0), "Europe/Paris");
-  return Count(true);
-}
-
-bool TestExtDatetime::test_timezone_name_get() {
-  Object tz = f_timezone_open("Asia/Shanghai");
-  VS(f_timezone_name_get(tz), "Asia/Shanghai");
-  return Count(true);
-}
-
-bool TestExtDatetime::test_timezone_offset_get() {
-  // Create two timezone objects, one for Taipei (Taiwan) and one for
-  // Tokyo (Japan)
-  Object dateTimeZoneTaipei = f_timezone_open("Asia/Taipei");
-  Object dateTimeZoneJapan = f_timezone_open("Asia/Tokyo");
-
-  // Create two DateTime objects that will contain the same Unix timestamp, but
-  // have different timezones attached to them.
-  Object dateTimeTaipei = f_date_create("2008-08-08", dateTimeZoneTaipei);
-  Object dateTimeJapan = f_date_create("2008-08-08", dateTimeZoneJapan);
-
-  VS(f_date_offset_get(dateTimeTaipei), 28800);
-  VS(f_date_offset_get(dateTimeJapan), 32400);
-
-  return Count(true);
-}
-
-bool TestExtDatetime::test_timezone_open() {
-  Object tz = f_timezone_open("Asia/Shanghai");
-  VS(f_timezone_name_get(tz), "Asia/Shanghai");
-  return Count(true);
-}
-
-static const StaticString
-  s_ts("ts"),
-  s_offset("offset"),
-  s_isdst("isdst"),
-  s_abbr("abbr");
-
-bool TestExtDatetime::test_timezone_transitions_get() {
-  Object timezone = f_timezone_open("CET");
-  Array transitions = f_timezone_transitions_get(timezone);
-  VS(transitions[0][s_ts], -1693706400);
-  VS(transitions[0][s_offset], 7200);
-  VS(transitions[0][s_isdst], true);
-  VS(transitions[0][s_abbr], "CEST");
-  return Count(true);
-}
-
-bool TestExtDatetime::test_timezone_version_get() {
-  VS(f_timezone_version_get().toBoolean(), true);
-  return Count(true);
-}
diff --git a/hphp/test/ext/test_ext_datetime.h b/hphp/test/ext/test_ext_datetime.h
deleted file mode 100644
index 73e7b4908..000000000
--- a/hphp/test/ext/test_ext_datetime.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
-   +----------------------------------------------------------------------+
-   | HipHop for PHP                                                       |
-   +----------------------------------------------------------------------+
-   | Copyright (c) 2010-2013 Facebook, Inc. (http://www.facebook.com)     |
-   +----------------------------------------------------------------------+
-   | This source file is subject to version 3.01 of the PHP license,      |
-   | that is bundled with this package in the file LICENSE, and is        |
-   | available through the world-wide-web at the following url:           |
-   | http://www.php.net/license/3_01.txt                                  |
-   | If you did not receive a copy of the PHP license and are unable to   |
-   | obtain it through the world-wide-web, please send a note to          |
-   | license@php.net so we can mail you a copy immediately.               |
-   +----------------------------------------------------------------------+
-*/
-
-#ifndef incl_HPHP_TEST_EXT_DATETIME_H_
-#define incl_HPHP_TEST_EXT_DATETIME_H_
-
-// >>>>>> Generated by idl.php. Do NOT modify. <<<<<<
-
-#include "hphp/test/ext/test_cpp_ext.h"
-
-///////////////////////////////////////////////////////////////////////////////
-
-class TestExtDatetime : public TestCppExt {
- public:
-  virtual bool RunTests(const std::string &which);
-
-  bool test_checkdate();
-  bool test_date_add();
-  bool test_date_create_from_format();
-  bool test_date_create();
-  bool test_date_date_set();
-  bool test_date_default_timezone_get();
-  bool test_date_default_timezone_set();
-  bool test_date_diff();
-  bool test_date_format();
-  bool test_date_get_last_errors();
-  bool test_date_interval_create_from_date_string();
-  bool test_date_interval_format();
-  bool test_date_isodate_set();
-  bool test_date_modify();
-  bool test_date_offset_get();
-  bool test_date_parse();
-  bool test_date_sub();
-  bool test_date_sun_info();
-  bool test_date_sunrise();
-  bool test_date_sunset();
-  bool test_date_time_set();
-  bool test_date_timestamp_get();
-  bool test_date_timestamp_set();
-  bool test_date_timezone_get();
-  bool test_date_timezone_set();
-  bool test_date();
-  bool test_getdate();
-  bool test_gettimeofday();
-  bool test_gmdate();
-  bool test_gmmktime();
-  bool test_gmstrftime();
-  bool test_idate();
-  bool test_localtime();
-  bool test_microtime();
-  bool test_mktime();
-  bool test_strftime();
-  bool test_strptime();
-  bool test_strtotime();
-  bool test_time();
-  bool test_timezone_abbreviations_list();
-  bool test_timezone_identifiers_list();
-  bool test_timezone_location_get();
-  bool test_timezone_name_from_abbr();
-  bool test_timezone_name_get();
-  bool test_timezone_offset_get();
-  bool test_timezone_open();
-  bool test_timezone_transitions_get();
-  bool test_timezone_version_get();
-};
-
-///////////////////////////////////////////////////////////////////////////////
-
-#endif // incl_HPHP_TEST_EXT_DATETIME_H_
diff --git a/hphp/test/slow/ext_datetime/checkdate.php b/hphp/test/slow/ext_datetime/checkdate.php
new file mode 100644
index 000000000..15e9863d9
--- /dev/null
+++ b/hphp/test/slow/ext_datetime/checkdate.php
@@ -0,0 +1,4 @@
+<?php
+
+var_dump(checkdate(12, 31, 2000));
+var_dump(!checkdate(2, 29, 2001));
diff --git a/hphp/test/slow/ext_datetime/checkdate.php.expect b/hphp/test/slow/ext_datetime/checkdate.php.expect
new file mode 100644
index 000000000..053a4cc7b
--- /dev/null
+++ b/hphp/test/slow/ext_datetime/checkdate.php.expect
@@ -0,0 +1,2 @@
+bool(true)
+bool(true)
diff --git a/hphp/test/slow/ext_datetime/date.php b/hphp/test/slow/ext_datetime/date.php
new file mode 100644
index 000000000..06b787481
--- /dev/null
+++ b/hphp/test/slow/ext_datetime/date.php
@@ -0,0 +1,104 @@
+<?php
+
+function VDT($dt, $what) {
+  var_dump(date_format($dt, "Y-m-d H:i:s") == $what);
+}
+
+VDT(date_create("2006-12-12"), "2006-12-12 00:00:00");
+VDT(date_create("@1170288001"), "2007-02-01 00:00:01");
+
+$dt = date_create("2006-12-12 12:34:56");
+date_date_set($dt, 2007, 11, 23);
+VDT($dt, "2007-11-23 12:34:56");
+
+
+$dt = date_create("2008-08-08 00:00:00");
+date_isodate_set($dt, 2007, 35, 3);
+VDT($dt, "2007-08-29 00:00:00");
+
+$dt = date_create("2006-12-12 00:00:00");
+date_modify($dt, "+1 day");
+VDT($dt, "2006-12-13 00:00:00");
+
+var_dump(date_offset_get(date_create("2006-12-12")) === -28800);
+var_dump(date_offset_get(date_create("2008-08-08")) === -25200);
+
+$dt = date_create("2006-12-12 12:34:56");
+date_time_set($dt, 23, 45, 12);
+VDT($dt, "2006-12-12 23:45:12");
+
+
+function VS($x, $y) {
+  var_dump($x === $y);
+  if ($x !== $y) { echo "Failed: $y\n"; }
+}
+
+$d = strtotime("2008-09-10 12:34:56");
+
+VS(date("l", $d), "Wednesday");
+
+VS(date("l jS \\of F Y h:i:s A", $d),
+   "Wednesday 10th of September 2008 12:34:56 PM");
+
+VS(date("l", mktime(0, 0, 0, 7, 1, 2000)), "Saturday");
+
+VS(date(DATE_RFC822, $d), "Wed, 10 Sep 08 12:34:56 -0700");
+
+VS(date(DATE_ATOM, mktime(0, 0, 0, 7, 1, 2000)),
+   "2000-07-01T00:00:00-07:00");
+
+VS(date("l \\t\\h\\e jS", $d), "Wednesday the 10th");
+
+$tomorrow = mktime(0,0,0,
+                        (int)date("m", $d),
+                        (int)date("d", $d) + 1,
+                        (int)date("Y", $d));
+VS($tomorrow, 1221116400);
+
+$lastmonth = mktime(0,0,0,
+                         (int)date("m", $d) - 1,
+                         (int)date("d", $d),
+                         (int)date("Y", $d));
+VS($lastmonth, 1218351600);
+
+$nextyear = mktime(0,0,0,
+                        (int)date("m", $d),
+                        (int)date("d", $d),
+                        (int)date("Y", $d) + 1);
+VS($nextyear, 1252566000);
+
+$d = strtotime("2001-03-10 05:16:18");
+VS(date("F j, Y, g:i a", $d), "March 10, 2001, 5:16 am");
+VS(date("m.d.y", $d), "03.10.01");
+VS(date("j, n, Y", $d), "10, 3, 2001");
+VS(date("Ymd", $d), "20010310");
+VS(date("h-i-s, j-m-y, it is w Day z ", $d),
+   "05-16-18, 10-03-01, 1631 1618 6 Satam01 68 ");
+VS(date("\\i\\t \\i\\s \\t\\h\\e jS \\d\\a\\y.", $d),
+   "it is the 10th day.");
+VS(date("D M j G:i:s T Y", $d), "Sat Mar 10 5:16:18 PST 2001");
+VS(date("H:m:s \\m \\i\\s\\ \\m\\o\\n\\t\\h", $d), "05:03:18 m is month");
+VS(date("H:i:s", $d), "05:16:18");
+
+$d = strtotime("1955-03-10 05:16:18");
+VS(date("Ymd", $d), "19550310");
+
+VS(date("r", -5000000000), "Tue, 23 Jul 1811 07:06:40 -0800");
+
+VS(mktime(0, 0, 0, 2, 26 - 91, 2010), 1259308800);
+
+$d = strtotime("2008-09-10 12:34:56");
+$today = getdate($d);
+var_dump($today);
+
+$tod = gettimeofday();
+VS(count($tod), 4);
+var_dump($tod['sec'] > 1073504408);
+var_dump(gettimeofday(true) > 1073504408.23910);
+
+$timestamp = strtotime("1st January 2004"); //1072915200
+
+// this prints the year in a two digit format
+// however, as this would start with a "0", it
+// only prints "4"
+VS(idate("y", $timestamp), 4);
diff --git a/hphp/test/slow/ext_datetime/date.php.expect b/hphp/test/slow/ext_datetime/date.php.expect
new file mode 100644
index 000000000..b2cff208e
--- /dev/null
+++ b/hphp/test/slow/ext_datetime/date.php.expect
@@ -0,0 +1,57 @@
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+array(11) {
+  ["seconds"]=>
+  int(56)
+  ["minutes"]=>
+  int(34)
+  ["hours"]=>
+  int(12)
+  ["mday"]=>
+  int(10)
+  ["wday"]=>
+  int(3)
+  ["mon"]=>
+  int(9)
+  ["year"]=>
+  int(2008)
+  ["yday"]=>
+  int(253)
+  ["weekday"]=>
+  string(9) "Wednesday"
+  ["month"]=>
+  string(9) "September"
+  [0]=>
+  int(1221075296)
+}
+bool(true)
+bool(true)
+bool(true)
+bool(true)
diff --git a/hphp/test/slow/ext_datetime/date_add.php b/hphp/test/slow/ext_datetime/date_add.php
new file mode 100644
index 000000000..51f4501a1
--- /dev/null
+++ b/hphp/test/slow/ext_datetime/date_add.php
@@ -0,0 +1,6 @@
+<?php
+
+$datetime = date_create("2010-08-16");
+$interval = date_interval_create_from_date_string("2 weeks");
+$dt2 = date_add($datetime, $interval);
+var_dump(date_format($dt2, "Y-m-d H:i:s") === "2010-08-30 00:00:00");
diff --git a/hphp/test/slow/ext_datetime/date_add.php.expect b/hphp/test/slow/ext_datetime/date_add.php.expect
new file mode 100644
index 000000000..ea5b1fdc3
--- /dev/null
+++ b/hphp/test/slow/ext_datetime/date_add.php.expect
@@ -0,0 +1 @@
+bool(true)
diff --git a/hphp/test/slow/ext_datetime/date_create.php b/hphp/test/slow/ext_datetime/date_create.php
new file mode 100644
index 000000000..bce344c66
--- /dev/null
+++ b/hphp/test/slow/ext_datetime/date_create.php
@@ -0,0 +1,6 @@
+<?php
+
+var_dump(date_format(date_create("2006-12-12"), "Y-m-d H:i:s") ===
+  "2006-12-12 00:00:00");
+var_dump(date_format(date_create("@1170288001"), "Y-m-d H:i:s") ===
+  "2007-02-01 00:00:01");
diff --git a/hphp/test/slow/ext_datetime/date_create.php.expect b/hphp/test/slow/ext_datetime/date_create.php.expect
new file mode 100644
index 000000000..053a4cc7b
--- /dev/null
+++ b/hphp/test/slow/ext_datetime/date_create.php.expect
@@ -0,0 +1,2 @@
+bool(true)
+bool(true)
diff --git a/hphp/test/slow/ext_datetime/date_format.php b/hphp/test/slow/ext_datetime/date_format.php
new file mode 100644
index 000000000..6853b0ee6
--- /dev/null
+++ b/hphp/test/slow/ext_datetime/date_format.php
@@ -0,0 +1,5 @@
+<?php
+
+$dt = date_create("@1170288001");
+var_dump(date_format($dt, "Y-m-d\\TH:i:s\\Z") === "2007-02-01T00:00:01Z");
+var_dump(date_format($dt, "Y-m-d H:i:sZ") === "2007-02-01 00:00:01-28800");
diff --git a/hphp/test/slow/ext_datetime/date_format.php.expect b/hphp/test/slow/ext_datetime/date_format.php.expect
new file mode 100644
index 000000000..053a4cc7b
--- /dev/null
+++ b/hphp/test/slow/ext_datetime/date_format.php.expect
@@ -0,0 +1,2 @@
+bool(true)
+bool(true)
diff --git a/hphp/test/slow/ext_datetime/date_get_last_errors.php b/hphp/test/slow/ext_datetime/date_get_last_errors.php
new file mode 100644
index 000000000..f0a020c15
--- /dev/null
+++ b/hphp/test/slow/ext_datetime/date_get_last_errors.php
@@ -0,0 +1,15 @@
+<?php
+
+$dt = date_create("asdfasdf");
+$errs = date_get_last_errors();
+var_dump(count($errs) === 4);
+
+var_dump($errs['warning_count'] === 1);
+$err_warnings = $errs['warnings'];
+var_dump(count($err_warnings) === 1);
+var_dump($err_warnings[6] === "Double timezone specification");
+
+var_dump($errs['error_count'] === 1);
+$err_errors = $errs['errors'];
+var_dump(count($err_errors) === 1);
+var_dump($err_errors[0] === "The timezone could not be found in the database");
diff --git a/hphp/test/slow/ext_datetime/date_get_last_errors.php.expect b/hphp/test/slow/ext_datetime/date_get_last_errors.php.expect
new file mode 100644
index 000000000..fae4ed595
--- /dev/null
+++ b/hphp/test/slow/ext_datetime/date_get_last_errors.php.expect
@@ -0,0 +1,7 @@
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
diff --git a/hphp/test/slow/ext_datetime/date_parse.php b/hphp/test/slow/ext_datetime/date_parse.php
new file mode 100644
index 000000000..88a14b93d
--- /dev/null
+++ b/hphp/test/slow/ext_datetime/date_parse.php
@@ -0,0 +1,2 @@
+<?php
+var_dump(date_parse("2006-12-12 10:00:00.5"));
diff --git a/hphp/test/slow/ext_datetime/date_parse.php.expect b/hphp/test/slow/ext_datetime/date_parse.php.expect
new file mode 100644
index 000000000..27e5302eb
--- /dev/null
+++ b/hphp/test/slow/ext_datetime/date_parse.php.expect
@@ -0,0 +1,28 @@
+array(12) {
+  ["year"]=>
+  int(2006)
+  ["month"]=>
+  int(12)
+  ["day"]=>
+  int(12)
+  ["hour"]=>
+  int(10)
+  ["minute"]=>
+  int(0)
+  ["second"]=>
+  int(0)
+  ["fraction"]=>
+  float(0.5)
+  ["warning_count"]=>
+  int(0)
+  ["warnings"]=>
+  array(0) {
+  }
+  ["error_count"]=>
+  int(0)
+  ["errors"]=>
+  array(0) {
+  }
+  ["is_localtime"]=>
+  bool(false)
+}
diff --git a/hphp/test/slow/ext_datetime/date_sun_info.php b/hphp/test/slow/ext_datetime/date_sun_info.php
new file mode 100644
index 000000000..c01171c9d
--- /dev/null
+++ b/hphp/test/slow/ext_datetime/date_sun_info.php
@@ -0,0 +1,27 @@
+<?php
+
+var_dump(date_sun_info(strtotime("2006-12-12"), 31.7667, 35.2333));
+
+/*
+ * calculate the sunrise time for Lisbon, Portugal
+ * Latitude: 38.4 North
+ * Longitude: 9 West
+ * Zenith ~= 90
+ * offset: +1 GMT
+ */
+var_dump(
+  date_sunrise(strtotime("2004-12-20"), SUNFUNCS_RET_STRING,
+               38.4, -9, 90, 1)
+);
+
+/*
+ * calculate the sunset time for Lisbon, Portugal
+ * Latitude: 38.4 North
+ * Longitude: 9 West
+ * Zenith ~= 90
+ * offset: +1 GMT
+ */
+var_dump(
+  date_sunset(strtotime("2004-12-20"), SUNFUNCS_RET_STRING,
+              38.4, -9, 90, 1)
+);
diff --git a/hphp/test/slow/ext_datetime/date_sun_info.php.expect b/hphp/test/slow/ext_datetime/date_sun_info.php.expect
new file mode 100644
index 000000000..5750a2c94
--- /dev/null
+++ b/hphp/test/slow/ext_datetime/date_sun_info.php.expect
@@ -0,0 +1,22 @@
+array(9) {
+  ["sunrise"]=>
+  int(1165897795)
+  ["sunset"]=>
+  int(1165934173)
+  ["transit"]=>
+  int(1165915984)
+  ["civil_twilight_begin"]=>
+  int(1165896189)
+  ["civil_twilight_end"]=>
+  int(1165935779)
+  ["nautical_twilight_begin"]=>
+  int(1165894366)
+  ["nautical_twilight_end"]=>
+  int(1165937603)
+  ["astronomical_twilight_begin"]=>
+  int(1165892582)
+  ["astronomical_twilight_end"]=>
+  int(1165939386)
+}
+string(5) "08:52"
+string(5) "18:15"
diff --git a/hphp/test/slow/ext_datetime/date_timestamp.php b/hphp/test/slow/ext_datetime/date_timestamp.php
new file mode 100644
index 000000000..9d9bbff05
--- /dev/null
+++ b/hphp/test/slow/ext_datetime/date_timestamp.php
@@ -0,0 +1,11 @@
+<?php
+
+$tz = timezone_open("America/Los_Angeles");
+$dt = date_create("2008-08-08 12:34:56", $tz);
+var_dump(date_timestamp_get($dt) === 1218224096);
+
+$tz = timezone_open("America/Los_Angeles");
+$dt = date_create("2008-08-08 12:34:56", $tz);
+date_timestamp_set($dt, 1000000000);
+var_dump(date_format($dt, "Y-m-d H:i:s") === "2001-09-08 18:46:40");
+
diff --git a/hphp/test/slow/ext_datetime/date_timestamp.php.expect b/hphp/test/slow/ext_datetime/date_timestamp.php.expect
new file mode 100644
index 000000000..053a4cc7b
--- /dev/null
+++ b/hphp/test/slow/ext_datetime/date_timestamp.php.expect
@@ -0,0 +1,2 @@
+bool(true)
+bool(true)
diff --git a/hphp/test/slow/ext_datetime/date_timezone.php b/hphp/test/slow/ext_datetime/date_timezone.php
new file mode 100644
index 000000000..c435c0557
--- /dev/null
+++ b/hphp/test/slow/ext_datetime/date_timezone.php
@@ -0,0 +1,53 @@
+<?php
+
+function VS($x, $y) {
+  var_dump($x === $y);
+  if ($x !== $y) { echo "Failed: $y\n"; }
+}
+
+var_dump(date_default_timezone_get());
+
+var_dump(date_default_timezone_set("Asia/Shanghai"));
+var_dump(date_default_timezone_get() === "Asia/Shanghai");
+var_dump(date_default_timezone_set("America/Los_Angeles"));
+var_dump(date_default_timezone_get() === "America/Los_Angeles");
+
+$dt = date_create("2008-08-08 12:34:56");
+var_dump(timezone_name_get(date_timezone_get($dt)) === "America/Los_Angeles");
+
+$dt = date_create("2008-08-08 12:34:56");
+date_timezone_set($dt, timezone_open("Asia/Shanghai"));
+var_dump(timezone_name_get(date_timezone_get($dt)) === "Asia/Shanghai");
+var_dump(date_format($dt, 'Y-m-d H:i:s'));
+
+VS(timezone_name_from_abbr("CET"), "Europe/Berlin");
+VS(timezone_name_from_abbr("", 3600, 0), "Europe/Paris");
+
+$tz = timezone_open("Asia/Shanghai");
+VS(timezone_name_get($tz), "Asia/Shanghai");
+
+// Create two timezone objects, one for Taipei (Taiwan) and one for
+// Tokyo (Japan)
+$dateTimeZoneTaipei = timezone_open("Asia/Taipei");
+$dateTimeZoneJapan = timezone_open("Asia/Tokyo");
+
+// Create two DateTime objects that will contain the same Unix timestamp, but
+// have different timezones attached to them.
+$dateTimeTaipei = date_create("2008-08-08", $dateTimeZoneTaipei);
+$dateTimeJapan = date_create("2008-08-08", $dateTimeZoneJapan);
+
+VS(date_offset_get($dateTimeTaipei), 28800);
+VS(date_offset_get($dateTimeJapan), 32400);
+
+$tz = timezone_open("Asia/Shanghai");
+VS(timezone_name_get($tz), "Asia/Shanghai");
+
+$timezone = timezone_open("CET");
+$transitions = timezone_transitions_get($timezone);
+VS($transitions[0]['ts'], -1693706400);
+VS($transitions[0]['offset'], 7200);
+VS($transitions[0]['isdst'], true);
+VS($transitions[0]['abbr'], "CEST");
+
+VS((bool)timezone_version_get(), true);
+
diff --git a/hphp/test/slow/ext_datetime/date_timezone.php.expect b/hphp/test/slow/ext_datetime/date_timezone.php.expect
new file mode 100644
index 000000000..f5f987590
--- /dev/null
+++ b/hphp/test/slow/ext_datetime/date_timezone.php.expect
@@ -0,0 +1,19 @@
+string(19) "America/Los_Angeles"
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+string(19) "2008-08-09 03:34:56"
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
diff --git a/hphp/test/slow/ext_datetime/gmfoo.php b/hphp/test/slow/ext_datetime/gmfoo.php
new file mode 100644
index 000000000..a33b69d95
--- /dev/null
+++ b/hphp/test/slow/ext_datetime/gmfoo.php
@@ -0,0 +1,26 @@
+<?php
+
+function VS($x, $y) {
+  var_dump($x === $y);
+  if ($x !== $y) { echo "Failed: $y\n"; echo "Got: $x\n"; }
+}
+
+$d = mktime(0, 0, 0, 1, 1, 1998);
+VS(date("M d Y H:i:s",   $d), "Jan 01 1998 00:00:00");
+VS(gmdate("M d Y H:i:s", $d), "Jan 01 1998 08:00:00");
+
+$d = gmmktime(0, 0, 0, 1, 1, 1998);
+VS(date("M d Y H:i:s",   $d), "Dec 31 1997 16:00:00");
+VS(gmdate("M d Y H:i:s", $d), "Jan 01 1998 00:00:00");
+
+setlocale(2, LC_TIME, "en_US.utf8");
+$d = mktime(20, 0, 0, 12, 31, 98);
+VS(strftime("%b %d %Y %H:%M:%S", $d),   "Dec 31 1998 20:00:00");
+VS(gmstrftime("%b %d %Y %H:%M:%S", $d), "Jan 01 1999 04:00:00");
+$t = mktime(0,0,0, 6, 27, 2006);
+VS(strftime("%a %A %b %B %c %C %d %D %e %g %G %h %H %I %j %m %M %n %p ".
+              "%r %R %S %t %T %u %U %V %W %w %x %X %y %Y %Z %z %%", $t),
+              "Tue Tuesday Jun June Tue 27 Jun 2006 12:00:00 AM PDT 20 27 ".
+              "06/27/06 27 06 2006 Jun 00 12 178 06 00 \n AM 12:00:00 AM ".
+              "00:00 00 \t 00:00:00 2 26 26 26 2 06/27/2006 12:00:00 AM ".
+              "06 2006 PDT -0700 %");
diff --git a/hphp/test/slow/ext_datetime/gmfoo.php.expect b/hphp/test/slow/ext_datetime/gmfoo.php.expect
new file mode 100644
index 000000000..fae4ed595
--- /dev/null
+++ b/hphp/test/slow/ext_datetime/gmfoo.php.expect
@@ -0,0 +1,7 @@
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
diff --git a/hphp/test/slow/ext_datetime/localtime.php b/hphp/test/slow/ext_datetime/localtime.php
new file mode 100644
index 000000000..133f634b4
--- /dev/null
+++ b/hphp/test/slow/ext_datetime/localtime.php
@@ -0,0 +1,7 @@
+<?php
+$d = strtotime("2008-09-10 12:34:56");
+
+$localtime = localtime($d);
+$localtime_assoc = localtime($d, true);
+var_dump($localtime);
+var_dump($localtime_assoc);
diff --git a/hphp/test/slow/ext_datetime/localtime.php.expect b/hphp/test/slow/ext_datetime/localtime.php.expect
new file mode 100644
index 000000000..f27140183
--- /dev/null
+++ b/hphp/test/slow/ext_datetime/localtime.php.expect
@@ -0,0 +1,40 @@
+array(9) {
+  [0]=>
+  int(56)
+  [1]=>
+  int(34)
+  [2]=>
+  int(12)
+  [3]=>
+  int(10)
+  [4]=>
+  int(8)
+  [5]=>
+  int(108)
+  [6]=>
+  int(3)
+  [7]=>
+  int(253)
+  [8]=>
+  int(1)
+}
+array(9) {
+  ["tm_sec"]=>
+  int(56)
+  ["tm_min"]=>
+  int(34)
+  ["tm_hour"]=>
+  int(12)
+  ["tm_mday"]=>
+  int(10)
+  ["tm_mon"]=>
+  int(8)
+  ["tm_year"]=>
+  int(108)
+  ["tm_wday"]=>
+  int(3)
+  ["tm_yday"]=>
+  int(253)
+  ["tm_isdst"]=>
+  int(1)
+}
diff --git a/hphp/test/slow/ext_datetime/microtime.php b/hphp/test/slow/ext_datetime/microtime.php
new file mode 100644
index 000000000..e857a7f91
--- /dev/null
+++ b/hphp/test/slow/ext_datetime/microtime.php
@@ -0,0 +1,4 @@
+<?php
+
+$time_start = microtime(true);
+var_dump($time_start > 0);
diff --git a/hphp/test/slow/ext_datetime/microtime.php.expect b/hphp/test/slow/ext_datetime/microtime.php.expect
new file mode 100644
index 000000000..ea5b1fdc3
--- /dev/null
+++ b/hphp/test/slow/ext_datetime/microtime.php.expect
@@ -0,0 +1 @@
+bool(true)
diff --git a/hphp/test/slow/ext_datetime/mktime.php b/hphp/test/slow/ext_datetime/mktime.php
new file mode 100644
index 000000000..61f536ab5
--- /dev/null
+++ b/hphp/test/slow/ext_datetime/mktime.php
@@ -0,0 +1,26 @@
+<?php
+
+$lastday = mktime(0, 0, 0, 3, 0, 2000);
+var_dump(strftime("Last day in Feb 2000 is: %d", $lastday));
+
+function VS($x, $y) {
+  var_dump($x === $y);
+  if ($x !== $y) { echo "Failed: $y\n"; }
+}
+
+/**
+ * We are not supporting negative parameters
+ * lastday = f_mktime(0, 0, 0, 4, -31, 2000);
+ * VS(f_strftime("Last day in Feb 2000 is: %d", lastday),
+ *    "Last day in Feb 2000 is: 29");
+ */
+
+VS(date("M-d-Y", mktime(0, 0, 0, 12, 32, 1997)), "Jan-01-1998");
+VS(date("M-d-Y", mktime(0, 0, 0, 13, 1, 1997)),  "Jan-01-1998");
+VS(date("M-d-Y", mktime(0, 0, 0, 1, 1, 1998)),   "Jan-01-1998");
+VS(date("M-d-Y", mktime(0, 0, 0, 1, 1, 98)),     "Jan-01-1998");
+VS(date("M-d-Y", mktime(0, 0, 0, 1, 1, 1900)),   "Jan-01-1900");
+VS(date("M-d-Y", mktime(0, 0, 0, 1, 1, 2100)),   "Jan-01-2100");
+VS(date("M-d-Y", mktime(0, 0, 0, 1, 1, 110)),    "Jan-01-0110");
+
+VS(date("h", mktime(9)), "09");
diff --git a/hphp/test/slow/ext_datetime/mktime.php.expect b/hphp/test/slow/ext_datetime/mktime.php.expect
new file mode 100644
index 000000000..e220c9ab5
--- /dev/null
+++ b/hphp/test/slow/ext_datetime/mktime.php.expect
@@ -0,0 +1,9 @@
+string(27) "Last day in Feb 2000 is: 29"
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
diff --git a/hphp/test/slow/ext_datetime/strftime.php b/hphp/test/slow/ext_datetime/strftime.php
new file mode 100644
index 000000000..7211ff3ea
--- /dev/null
+++ b/hphp/test/slow/ext_datetime/strftime.php
@@ -0,0 +1,61 @@
+<?php
+
+function VS($x, $y) {
+  var_dump($x === $y);
+  if ($x !== $y) { echo "Failed: $y\n"; }
+}
+
+$ts = mktime(0, 0, 0, 8, 5, 1998);
+
+setlocale(2, LC_TIME, "C");
+VS(strftime("%A", $ts), "Wednesday");
+
+if (setlocale(2, LC_TIME, "fi_FI")) {
+  VS(strftime(" in Finnish is %A,", $ts), " in Finnish is keskiviikko,");
+} else {
+  //SKIP("setlocale() failed");
+}
+
+if (setlocale(2, LC_TIME, "fr_FR")) {
+  VS(strftime(" in French %A and", $ts), " in French mercredi and");
+} else {
+  //SKIP("setlocale() failed");
+}
+
+if (setlocale(2, LC_TIME, "de_DE")) {
+  VS(strftime(" in German %A.", $ts), " in German Mittwoch.");
+} else {
+  //SKIP("setlocale() failed");
+}
+
+setlocale(2, LC_TIME, "C");
+
+/*
+December 2002 / January 2003
+ISOWk  M   Tu  W   Thu F   Sa  Su
+----- ----------------------------
+51     16  17  18  19  20  21  22
+52     23  24  25  26  27  28  29
+1      30  31   1   2   3   4   5
+2       6   7   8   9  10  11  12
+3      13  14  15  16  17  18  19
+*/
+VS(strftime("%V,%G,%Y", strtotime("12/28/2002")), "52,2002,2002");
+VS(strftime("%V,%G,%Y", strtotime("12/30/2002")), "01,2003,2002");
+VS(strftime("%V,%G,%Y", strtotime("1/3/2003")),   "01,2003,2003");
+VS(strftime("%V,%G,%Y", strtotime("1/10/2003")),  "02,2003,2003");
+
+/*
+December 2004 / January 2005
+ISOWk  M   Tu  W   Thu F   Sa  Su
+----- ----------------------------
+51     13  14  15  16  17  18  19
+52     20  21  22  23  24  25  26
+53     27  28  29  30  31   1   2
+1       3   4   5   6   7   8   9
+2      10  11  12  13  14  15  16
+*/
+VS(strftime("%V,%G,%Y", strtotime("12/23/2004")), "52,2004,2004");
+VS(strftime("%V,%G,%Y", strtotime("12/31/2004")), "53,2004,2004");
+VS(strftime("%V,%G,%Y", strtotime("1/2/2005")),   "53,2004,2005");
+VS(strftime("%V,%G,%Y", strtotime("1/3/2005")),   "01,2005,2005");
diff --git a/hphp/test/slow/ext_datetime/strftime.php.expect b/hphp/test/slow/ext_datetime/strftime.php.expect
new file mode 100644
index 000000000..601846ec2
--- /dev/null
+++ b/hphp/test/slow/ext_datetime/strftime.php.expect
@@ -0,0 +1,12 @@
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
diff --git a/hphp/test/slow/ext_datetime/strptime.php b/hphp/test/slow/ext_datetime/strptime.php
new file mode 100644
index 000000000..4c2ee46ae
--- /dev/null
+++ b/hphp/test/slow/ext_datetime/strptime.php
@@ -0,0 +1,6 @@
+<?php
+
+$format = "%d/%m/%Y %H:%M:%S";
+$strf = strftime($format, strtotime("10/03/2004 15:54:19"));
+var_dump($strf);
+var_dump(strptime($strf, $format));
diff --git a/hphp/test/slow/ext_datetime/strptime.php.expect b/hphp/test/slow/ext_datetime/strptime.php.expect
new file mode 100644
index 000000000..c5d3b8d50
--- /dev/null
+++ b/hphp/test/slow/ext_datetime/strptime.php.expect
@@ -0,0 +1,21 @@
+string(19) "03/10/2004 15:54:19"
+array(9) {
+  ["tm_sec"]=>
+  int(19)
+  ["tm_min"]=>
+  int(54)
+  ["tm_hour"]=>
+  int(15)
+  ["tm_mday"]=>
+  int(3)
+  ["tm_mon"]=>
+  int(9)
+  ["tm_year"]=>
+  int(104)
+  ["tm_wday"]=>
+  int(0)
+  ["tm_yday"]=>
+  int(276)
+  ["unparsed"]=>
+  string(0) ""
+}
diff --git a/hphp/test/slow/ext_datetime/strtotime.php b/hphp/test/slow/ext_datetime/strtotime.php
new file mode 100644
index 000000000..3aa0253c3
--- /dev/null
+++ b/hphp/test/slow/ext_datetime/strtotime.php
@@ -0,0 +1,20 @@
+<?php
+
+function VS($x, $y) {
+  var_dump($x === $y);
+  if ($x !== $y) { echo "Failed: $y\n"; }
+}
+
+var_dump(strtotime("now") > 0);
+VS(strtotime("10 September 2000"), 968569200);
+VS(strtotime("+1 day", 968569200), 968655600);
+VS(strtotime("+1 week", 968569200), 969174000);
+VS(strtotime("+1 week 2 days 4 hours 2 seconds", 968569200), 969361202);
+VS(strtotime("next Thursday", 968569200), 968914800);
+VS(strtotime("last Monday", 968569200), 968050800);
+
+$str = "Not Good";
+$timestamp = strtotime($str);
+VS($timestamp, false);
+VS(strtotime(""), false);
+
diff --git a/hphp/test/slow/ext_datetime/strtotime.php.expect b/hphp/test/slow/ext_datetime/strtotime.php.expect
new file mode 100644
index 000000000..53973d643
--- /dev/null
+++ b/hphp/test/slow/ext_datetime/strtotime.php.expect
@@ -0,0 +1,9 @@
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
diff --git a/hphp/test/slow/ext_datetime/test_time.php b/hphp/test/slow/ext_datetime/test_time.php
new file mode 100644
index 000000000..00eaf125d
--- /dev/null
+++ b/hphp/test/slow/ext_datetime/test_time.php
@@ -0,0 +1,8 @@
+<?php
+// XXX This test fails between 12:00AM and 12:59AM on 10/31/11 - 11/6/11
+// and between 11:00PM and 11:59PM on 3/6/11 - 3/12/11, we should fix this.
+// This issue appears to have something to do with how strtotime() handles
+// daylight savings time.
+$nextWeek = time() + (7 * 24 * 60 * 60);
+var_dump(date("Y-m-d", $nextWeek) ==
+         date("Y-m-d", strtotime("+1 week")));
diff --git a/hphp/test/slow/ext_datetime/test_time.php.expect b/hphp/test/slow/ext_datetime/test_time.php.expect
new file mode 100644
index 000000000..ea5b1fdc3
--- /dev/null
+++ b/hphp/test/slow/ext_datetime/test_time.php.expect
@@ -0,0 +1 @@
+bool(true)
diff --git a/hphp/test/slow/ext_datetime/timelib_dependent.php b/hphp/test/slow/ext_datetime/timelib_dependent.php
new file mode 100644
index 000000000..102beb017
--- /dev/null
+++ b/hphp/test/slow/ext_datetime/timelib_dependent.php
@@ -0,0 +1,49 @@
+<?php
+
+/*
+ * These tests only "work" depending on the version of timelib we're
+ * linked with.
+ *
+ * We've set them up to pass anyway, using the error handler.  This is
+ * a little inconvenient (as the output is entirely one bool ...), but
+ * better than no way to test.
+ */
+function handler() {
+  var_dump(true);
+}
+set_error_handler('handler');
+
+function do_date_diff() {
+  $dt1 = date_create("2010-08-02");
+  $dt2 = date_create("2010-08-30");
+  $interval = date_diff($dt1, $dt2, true);
+  return date_interval_format($interval, "%d") === "28";
+}
+
+function test_date_interval_create_from_date_string() {
+  $interval = date_interval_create_from_date_string("2 weeks");
+  return date_interval_format($interval, "%d") === "14";
+}
+
+function test_date_sub() {
+  $datetime = date_create("2010-08-16");
+  $interval = date_interval_create_from_date_string("2 weeks");
+  $dt2 = date_sub($datetime, $interval);
+  return date_format($dt2, "Y-m-d") === "2010-08-02";
+}
+
+function test_timezone_location_get() {
+  $tz = timezone_open("Europe/Prague");
+  $loc = timezone_location_get(tz);
+  return count($loc) === 4 &&
+         (string)$loc['country_code'] === "CZ" &&
+         (int)((double)$loc['latitude'] * 100) === 5008 &&
+         (int)((double)$loc['longitude'] * 100) === 1443 &&
+         (string)$loc['comments'] === ""
+         ;
+}
+
+var_dump(test_date_diff() &&
+         test_date_interval_create_from_date_string() &&
+         test_date_sub() &&
+         test_timezone_location_get());
diff --git a/hphp/test/slow/ext_datetime/timelib_dependent.php.expect b/hphp/test/slow/ext_datetime/timelib_dependent.php.expect
new file mode 100644
index 000000000..ea5b1fdc3
--- /dev/null
+++ b/hphp/test/slow/ext_datetime/timelib_dependent.php.expect
@@ -0,0 +1 @@
+bool(true)