diff --git a/Makefile b/Makefile
index 288c257396de..bcf3bcca0d11 100644
--- a/Makefile
+++ b/Makefile
@@ -124,9 +124,10 @@ endif
 ifeq ($(regexp), interpreted)
   GYPFLAGS += -Dv8_interpreted_regexp=1
 endif
-# i18nsupport=on
-ifeq ($(i18nsupport), on)
-  GYPFLAGS += -Dv8_enable_i18n_support=1
+# i18nsupport=off
+ifeq ($(i18nsupport), off)
+  GYPFLAGS += -Dv8_enable_i18n_support=0
+  TESTFLAGS += --noi18n
 endif
 # arm specific flags.
 # armv7=false/true
@@ -331,7 +332,7 @@ $(addsuffix .check, $(ANDROID_ARCHES)): \
 $(addsuffix .check, $(NACL_BUILDS)): $$(basename $$@)
 	@tools/run-tests.py $(TESTJOBS) --outdir=$(OUTDIR) \
 	     --arch-and-mode=$(basename $@) \
-	     --timeout=600 --nopresubmit \
+	     --timeout=600 --nopresubmit --noi18n \
 	     --command-prefix="tools/nacl-run.py"
 
 $(addsuffix .check, $(NACL_ARCHES)): \
diff --git a/Makefile.nacl b/Makefile.nacl
index 02e83ef2bca4..2c79ef113e3d 100644
--- a/Makefile.nacl
+++ b/Makefile.nacl
@@ -74,6 +74,9 @@ endif
 # For mksnapshot host generation.
 GYPENV += host_os=${HOST_OS}
 
+# ICU doesn't support NaCl.
+GYPENV += v8_enable_i18n_support=0
+
 NACL_MAKEFILES = $(addprefix $(OUTDIR)/Makefile.,$(NACL_ARCHES))
 .SECONDEXPANSION:
 # For some reason the $$(basename $$@) expansion didn't work here...
diff --git a/build/features.gypi b/build/features.gypi
index 3c6d25f7587c..5343284dbc98 100644
--- a/build/features.gypi
+++ b/build/features.gypi
@@ -54,7 +54,7 @@
 
     # Enable ECMAScript Internationalization API. Enabling this feature will
     # add a dependency on the ICU library.
-    'v8_enable_i18n_support%': 0,
+    'v8_enable_i18n_support%': 1,
   },
   'target_defaults': {
     'conditions': [
diff --git a/build/standalone.gypi b/build/standalone.gypi
index f18333127a53..3d4f8049ad23 100644
--- a/build/standalone.gypi
+++ b/build/standalone.gypi
@@ -36,7 +36,7 @@
     'clang%': 0,
     'visibility%': 'hidden',
     'v8_enable_backtrace%': 0,
-    'v8_enable_i18n_support%': 0,
+    'v8_enable_i18n_support%': 1,
     'msvs_multi_core_compile%': '1',
     'mac_deployment_target%': '10.5',
     'variables': {
diff --git a/samples/samples.gyp b/samples/samples.gyp
index c93deca4f44f..dfc7410070b3 100644
--- a/samples/samples.gyp
+++ b/samples/samples.gyp
@@ -28,7 +28,7 @@
 {
   'variables': {
     'v8_code': 1,
-    'v8_enable_i18n_support%': 0,
+    'v8_enable_i18n_support%': 1,
   },
   'includes': ['../build/toolchain.gypi', '../build/features.gypi'],
   'target_defaults': {
diff --git a/src/d8.gyp b/src/d8.gyp
index c033fd7e4e47..097abc04652f 100644
--- a/src/d8.gyp
+++ b/src/d8.gyp
@@ -31,7 +31,7 @@
     'console%': '',
     # Enable support for Intel VTune. Supported on ia32/x64 only
     'v8_enable_vtunejit%': 0,
-    'v8_enable_i18n_support%': 0,
+    'v8_enable_i18n_support%': 1,
   },
   'includes': ['../build/toolchain.gypi', '../build/features.gypi'],
   'targets': [
diff --git a/test/mozilla/mozilla.status b/test/mozilla/mozilla.status
index 9878730b2cf8..bf1578fd1c7e 100644
--- a/test/mozilla/mozilla.status
+++ b/test/mozilla/mozilla.status
@@ -45,6 +45,12 @@
 prefix mozilla
 def FAIL_OK = FAIL, OKAY
 
+##################### NEEDS INVESTIGATION ##############
+
+# BUG(2893): These tests started to fail after i18n support was turned on. Need
+# to investigate why.
+ecma_3/Number/15.7.4.3-02: PASS || FAIL
+ecma_3/Date/15.9.5.5-02: PASS || FAIL
 
 ##################### SKIPPED TESTS #####################
 
diff --git a/test/test262/test262.status b/test/test262/test262.status
index 4910939f15a8..d080e01c57b9 100644
--- a/test/test262/test262.status
+++ b/test/test262/test262.status
@@ -36,11 +36,6 @@ def FAIL_OK = FAIL, OKAY
 # V8 Bug: http://code.google.com/p/v8/issues/detail?id=691
 11.2.3-3_3: FAIL
 
-# Strings that are considered canonically equivalent by the Unicode standard
-# return a non-zero value on String.prototype.localeCompare calls.
-# V8 Bug: http://code.google.com/p/v8/issues/detail?id=2413
-15.5.4.9_CE: FAIL
-
 ##################### DELIBERATE INCOMPATIBILITIES #####################
 
 # This tests precision of Math functions.  The implementation for those
diff --git a/tools/run-tests.py b/tools/run-tests.py
index 48682d4444e5..d023cf1fbaaa 100755
--- a/tools/run-tests.py
+++ b/tools/run-tests.py
@@ -112,6 +112,9 @@ def BuildOptions():
   result.add_option("-m", "--mode",
                     help="The test modes in which to run (comma-separated)",
                     default="release,debug")
+  result.add_option("--no-i18n", "--noi18n",
+                    help="Skip internationalization tests",
+                    default=False, action="store_true")
   result.add_option("--no-network", "--nonetwork",
                     help="Don't distribute tests on the network",
                     default=(utils.GuessOS() != "linux"),
@@ -210,6 +213,8 @@ def ProcessOptions(options):
   if not options.flaky_tests in ["run", "skip", "dontcare"]:
     print "Unknown flaky test mode %s" % options.flaky_tests
     return False
+  if not options.no_i18n:
+    DEFAULT_TESTS.append("intl")
   return True