diff --git a/rhino-tools/src/main/java/org/mozilla/javascript/tools/shell/ShellContextFactory.java b/rhino-tools/src/main/java/org/mozilla/javascript/tools/shell/ShellContextFactory.java
index f43cc1a69c..61c96fc17c 100644
--- a/rhino-tools/src/main/java/org/mozilla/javascript/tools/shell/ShellContextFactory.java
+++ b/rhino-tools/src/main/java/org/mozilla/javascript/tools/shell/ShellContextFactory.java
@@ -13,7 +13,7 @@
 public class ShellContextFactory extends ContextFactory {
     private boolean strictMode;
     private boolean warningAsError;
-    private int languageVersion = Context.VERSION_1_8;
+    private int languageVersion = Context.VERSION_ES6;
     private int optimizationLevel;
     private boolean generatingDebug;
     private boolean allowReservedKeywords = true;
diff --git a/tests/src/test/java/org/mozilla/javascript/tests/MozillaSuiteTest.java b/tests/src/test/java/org/mozilla/javascript/tests/MozillaSuiteTest.java
index 1434700c98..070e86b404 100644
--- a/tests/src/test/java/org/mozilla/javascript/tests/MozillaSuiteTest.java
+++ b/tests/src/test/java/org/mozilla/javascript/tests/MozillaSuiteTest.java
@@ -21,6 +21,7 @@
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 import org.junit.runners.Parameterized.Parameters;
+import org.mozilla.javascript.Context;
 import org.mozilla.javascript.drivers.JsTestsBase;
 import org.mozilla.javascript.drivers.ShellTest;
 import org.mozilla.javascript.drivers.TestUtils;
@@ -194,6 +195,7 @@ public void runMozillaTest() throws Exception {
         // optimizationLevel);
         final ShellContextFactory shellContextFactory = new ShellContextFactory();
         shellContextFactory.setOptimizationLevel(optimizationLevel);
+        shellContextFactory.setLanguageVersion(Context.VERSION_1_8);
         ShellTestParameters params = new ShellTestParameters();
         JunitStatus status = new JunitStatus();
         ShellTest.runNoFork(shellContextFactory, jsFile, params, status);