diff --git a/test/com/google/javascript/jscomp/ClosureOptimizePrimitivesTest.java b/test/com/google/javascript/jscomp/ClosureOptimizePrimitivesTest.java
index 32b2bf899cf..37c1f958ac8 100644
--- a/test/com/google/javascript/jscomp/ClosureOptimizePrimitivesTest.java
+++ b/test/com/google/javascript/jscomp/ClosureOptimizePrimitivesTest.java
@@ -38,6 +38,7 @@ public final class ClosureOptimizePrimitivesTest extends CompilerTestCase {
   protected void setUp() throws Exception {
     super.setUp();
     setAcceptedLanguage(LanguageMode.ECMASCRIPT_2017);
+    disableScriptFeatureValidation();
   }
 
   public void testObjectCreateOddParams() {
diff --git a/test/com/google/javascript/jscomp/CollapsePropertiesTest.java b/test/com/google/javascript/jscomp/CollapsePropertiesTest.java
index 5fcafd51985..80c6fe3a237 100644
--- a/test/com/google/javascript/jscomp/CollapsePropertiesTest.java
+++ b/test/com/google/javascript/jscomp/CollapsePropertiesTest.java
@@ -52,6 +52,7 @@ protected CompilerPass getProcessor(final Compiler compiler) {
   protected void setUp() throws Exception {
     super.setUp();
     enableNormalize();
+    disableScriptFeatureValidation();
   }
 
   @Override
diff --git a/test/com/google/javascript/jscomp/CompilerTestCase.java b/test/com/google/javascript/jscomp/CompilerTestCase.java
index 7c07c115ac2..57d8b992a79 100644
--- a/test/com/google/javascript/jscomp/CompilerTestCase.java
+++ b/test/com/google/javascript/jscomp/CompilerTestCase.java
@@ -584,7 +584,7 @@ protected void setUp() throws Exception {
     this.allowSourcelessWarnings = false;
     this.astValidationEnabled = true;
     this.typeInfoValidationEnabled = false;
-    this.scriptFeatureValidationEnabled = false;
+    this.scriptFeatureValidationEnabled = true;
     this.checkAccessControls = false;
     this.checkAstChangeMarking = true;
     this.checkLineNumbers = true;
diff --git a/test/com/google/javascript/jscomp/CrossModuleCodeMotionTest.java b/test/com/google/javascript/jscomp/CrossModuleCodeMotionTest.java
index fd50a7f1477..0a2f6f7c6f8 100644
--- a/test/com/google/javascript/jscomp/CrossModuleCodeMotionTest.java
+++ b/test/com/google/javascript/jscomp/CrossModuleCodeMotionTest.java
@@ -39,6 +39,7 @@ protected int getNumRepetitions() {
   protected void setUp() throws Exception {
     super.setUp();
 
+    disableScriptFeatureValidation();
     parentModuleCanSeeSymbolsDeclaredInChildren = false;
   }
 
diff --git a/test/com/google/javascript/jscomp/Es6ConvertSuperTest.java b/test/com/google/javascript/jscomp/Es6ConvertSuperTest.java
index a971d5a5005..d9cd178872b 100644
--- a/test/com/google/javascript/jscomp/Es6ConvertSuperTest.java
+++ b/test/com/google/javascript/jscomp/Es6ConvertSuperTest.java
@@ -55,6 +55,7 @@ protected void setUp() throws Exception {
     setLanguageOut(LanguageMode.ECMASCRIPT5);
     enableRunTypeCheckAfterProcessing();
     disableTypeCheck();
+    disableScriptFeatureValidation();
   }
 
   @Override
diff --git a/test/com/google/javascript/jscomp/Es6ExtractClassesTest.java b/test/com/google/javascript/jscomp/Es6ExtractClassesTest.java
index 769dd198556..17cbdd47527 100644
--- a/test/com/google/javascript/jscomp/Es6ExtractClassesTest.java
+++ b/test/com/google/javascript/jscomp/Es6ExtractClassesTest.java
@@ -35,6 +35,7 @@ protected void setUp() throws Exception {
     setLanguageOut(LanguageMode.ECMASCRIPT3);
     disableTypeCheck();
     enableRunTypeCheckAfterProcessing();
+    disableScriptFeatureValidation();
   }
 
   public void testExtractionFromCall() {
diff --git a/test/com/google/javascript/jscomp/Es6RewriteArrowFunctionTest.java b/test/com/google/javascript/jscomp/Es6RewriteArrowFunctionTest.java
index 804239610e1..f9a2e643197 100644
--- a/test/com/google/javascript/jscomp/Es6RewriteArrowFunctionTest.java
+++ b/test/com/google/javascript/jscomp/Es6RewriteArrowFunctionTest.java
@@ -34,6 +34,7 @@ protected void setUp() throws Exception {
 
     enableTypeInfoValidation();
     enableTypeCheck();
+    disableScriptFeatureValidation();
   }
 
   @Override
diff --git a/test/com/google/javascript/jscomp/Es6RewriteBlockScopedFunctionDeclarationTest.java b/test/com/google/javascript/jscomp/Es6RewriteBlockScopedFunctionDeclarationTest.java
index 09eac4648b4..f9ff503e6d8 100644
--- a/test/com/google/javascript/jscomp/Es6RewriteBlockScopedFunctionDeclarationTest.java
+++ b/test/com/google/javascript/jscomp/Es6RewriteBlockScopedFunctionDeclarationTest.java
@@ -27,6 +27,7 @@ protected void setUp() throws Exception {
     setAcceptedLanguage(LanguageMode.ECMASCRIPT_2015);
     enableTypeCheck();
     enableTypeInfoValidation();
+    disableScriptFeatureValidation();
   }
 
   @Override
diff --git a/test/com/google/javascript/jscomp/Es6RewriteDestructuringTest.java b/test/com/google/javascript/jscomp/Es6RewriteDestructuringTest.java
index bca66dc2263..6acba137883 100644
--- a/test/com/google/javascript/jscomp/Es6RewriteDestructuringTest.java
+++ b/test/com/google/javascript/jscomp/Es6RewriteDestructuringTest.java
@@ -27,6 +27,7 @@ protected void setUp() throws Exception {
     setAcceptedLanguage(LanguageMode.ECMASCRIPT_2015);
     disableTypeCheck();
     enableRunTypeCheckAfterProcessing();
+    disableScriptFeatureValidation();
   }
 
   @Override
diff --git a/test/com/google/javascript/jscomp/Es6RewriteModulesTest.java b/test/com/google/javascript/jscomp/Es6RewriteModulesTest.java
index 65acadb576b..d2e5c0882d5 100644
--- a/test/com/google/javascript/jscomp/Es6RewriteModulesTest.java
+++ b/test/com/google/javascript/jscomp/Es6RewriteModulesTest.java
@@ -34,6 +34,7 @@ protected void setUp() throws Exception {
     // ECMASCRIPT5 to trigger module processing after parsing.
     setLanguage(LanguageMode.ECMASCRIPT_2015, LanguageMode.ECMASCRIPT5);
     enableRunTypeCheckAfterProcessing();
+    disableScriptFeatureValidation();
   }
 
   @Override
diff --git a/test/com/google/javascript/jscomp/Es6RewriteModulesToCommonJsModulesTest.java b/test/com/google/javascript/jscomp/Es6RewriteModulesToCommonJsModulesTest.java
index 3b1805aa46e..473fc075369 100644
--- a/test/com/google/javascript/jscomp/Es6RewriteModulesToCommonJsModulesTest.java
+++ b/test/com/google/javascript/jscomp/Es6RewriteModulesToCommonJsModulesTest.java
@@ -39,6 +39,7 @@ protected void setUp() throws Exception {
     resolutionMode = ModuleLoader.ResolutionMode.BROWSER;
     prefixReplacements = ImmutableMap.of();
     pathEscaper = PathEscaper.ESCAPE;
+    disableScriptFeatureValidation();
   }
 
   @Override
diff --git a/test/com/google/javascript/jscomp/Es6RewriteRestAndSpreadTest.java b/test/com/google/javascript/jscomp/Es6RewriteRestAndSpreadTest.java
index 3be338f14c2..d2abfb973ad 100644
--- a/test/com/google/javascript/jscomp/Es6RewriteRestAndSpreadTest.java
+++ b/test/com/google/javascript/jscomp/Es6RewriteRestAndSpreadTest.java
@@ -54,6 +54,7 @@ protected void setUp() throws Exception {
     setLanguageOut(LanguageMode.ECMASCRIPT3);
     enableTypeInfoValidation();
     enableTypeCheck();
+    disableScriptFeatureValidation();
   }
 
   // Spreading into array literals.
diff --git a/test/com/google/javascript/jscomp/Es6ToEs3ConverterTest.java b/test/com/google/javascript/jscomp/Es6ToEs3ConverterTest.java
index 624e686eb6e..e899ef01f65 100644
--- a/test/com/google/javascript/jscomp/Es6ToEs3ConverterTest.java
+++ b/test/com/google/javascript/jscomp/Es6ToEs3ConverterTest.java
@@ -99,6 +99,7 @@ protected void setUp() throws Exception {
     setLanguageOut(LanguageMode.ECMASCRIPT3);
     enableRunTypeCheckAfterProcessing();
     disableTypeCheck();
+    disableScriptFeatureValidation();
   }
 
   protected final PassFactory makePassFactory(
diff --git a/test/com/google/javascript/jscomp/Es6TypedToEs6ConverterTest.java b/test/com/google/javascript/jscomp/Es6TypedToEs6ConverterTest.java
index b42cd489b89..6403282fb92 100644
--- a/test/com/google/javascript/jscomp/Es6TypedToEs6ConverterTest.java
+++ b/test/com/google/javascript/jscomp/Es6TypedToEs6ConverterTest.java
@@ -23,6 +23,7 @@ public final class Es6TypedToEs6ConverterTest extends CompilerTestCase {
   protected void setUp() throws Exception {
     super.setUp();
     setAcceptedLanguage(LanguageMode.ECMASCRIPT6_TYPED);
+    disableScriptFeatureValidation();
   }
 
   @Override
diff --git a/test/com/google/javascript/jscomp/EsNextToEs8ConverterTest.java b/test/com/google/javascript/jscomp/EsNextToEs8ConverterTest.java
index 7bde3b33a39..737e79b23e3 100644
--- a/test/com/google/javascript/jscomp/EsNextToEs8ConverterTest.java
+++ b/test/com/google/javascript/jscomp/EsNextToEs8ConverterTest.java
@@ -30,6 +30,7 @@ protected void setUp() throws Exception {
     setAcceptedLanguage(LanguageMode.ECMASCRIPT_NEXT);
     setLanguageOut(LanguageMode.ECMASCRIPT_2017);
     enableRunTypeCheckAfterProcessing();
+    disableScriptFeatureValidation();
   }
 
   @Override
diff --git a/test/com/google/javascript/jscomp/MinimizeExitPointsTest.java b/test/com/google/javascript/jscomp/MinimizeExitPointsTest.java
index f3558a47a95..3ed2ab2227a 100644
--- a/test/com/google/javascript/jscomp/MinimizeExitPointsTest.java
+++ b/test/com/google/javascript/jscomp/MinimizeExitPointsTest.java
@@ -20,6 +20,13 @@
  * @author johnlenz@google.com (John Lenz)
  */
 public final class MinimizeExitPointsTest extends CompilerTestCase {
+  @Override
+  protected void setUp() throws Exception {
+    super.setUp();
+
+    disableScriptFeatureValidation();
+  }
+
   @Override
   protected CompilerPass getProcessor(final Compiler compiler) {
     return new PeepholeOptimizationsPass(compiler, getName(), new MinimizeExitPoints());
diff --git a/test/com/google/javascript/jscomp/MultiPassTest.java b/test/com/google/javascript/jscomp/MultiPassTest.java
index c15a4afff09..f29ff9bc828 100644
--- a/test/com/google/javascript/jscomp/MultiPassTest.java
+++ b/test/com/google/javascript/jscomp/MultiPassTest.java
@@ -40,6 +40,7 @@ protected void setUp() throws Exception {
     setAcceptedLanguage(LanguageMode.ECMASCRIPT5);
     enableNormalize();
     enableGatherExternProperties();
+    disableScriptFeatureValidation();
   }
 
   @Override
diff --git a/test/com/google/javascript/jscomp/SubstituteEs6SyntaxTest.java b/test/com/google/javascript/jscomp/SubstituteEs6SyntaxTest.java
index b397225ad1d..639b6564118 100644
--- a/test/com/google/javascript/jscomp/SubstituteEs6SyntaxTest.java
+++ b/test/com/google/javascript/jscomp/SubstituteEs6SyntaxTest.java
@@ -25,6 +25,7 @@ public final class SubstituteEs6SyntaxTest extends CompilerTestCase {
   protected void setUp() throws Exception {
     super.setUp();
     setAcceptedLanguage(CompilerOptions.LanguageMode.ECMASCRIPT_2015);
+    disableScriptFeatureValidation();
   }
 
   @Override