diff --git a/test/com/google/javascript/jscomp/IntegrationTest.java b/test/com/google/javascript/jscomp/IntegrationTest.java
index 3a6ba8812d5..8891f0a16d3 100644
--- a/test/com/google/javascript/jscomp/IntegrationTest.java
+++ b/test/com/google/javascript/jscomp/IntegrationTest.java
@@ -28,6 +28,7 @@
 import com.google.javascript.jscomp.CompilerOptions.DevMode;
 import com.google.javascript.jscomp.CompilerOptions.LanguageMode;
 import com.google.javascript.jscomp.CompilerOptions.Reach;
+import com.google.javascript.jscomp.CompilerTestCase.NoninjectingCompiler;
 import com.google.javascript.jscomp.testing.NodeSubject;
 import com.google.javascript.rhino.Node;
 import com.google.javascript.rhino.Token;
@@ -475,13 +476,16 @@ public void testArrayValuesIsPolyfilledForEs2015Out() {
     options.setRewritePolyfills(true);
     options.setLanguageIn(LanguageMode.ECMASCRIPT_2015);
     options.setLanguageOut(LanguageMode.ECMASCRIPT_2015);
-    Compiler compiler = compile(
+
+    NoninjectingCompiler compiler = new NoninjectingCompiler();
+    compile(
         options,
-        "for (const x of [1, 2, 3].values()) { alert(x); }");
+        new String[] {"for (const x of [1, 2, 3].values()) { alert(x); }"},
+        compiler);
+
     assertThat(compiler.getResult().errors).isEmpty();
     assertThat(compiler.getResult().warnings).isEmpty();
-    assertThat(compiler.getResult().warnings).isEmpty();
-    assertThat(compiler.toSource()).contains("Array.prototype.values");
+    assertThat(compiler.injected).containsExactly("es6/array/values");
   }
 
   public void testWindowIsTypedEs6() {
diff --git a/test/com/google/javascript/jscomp/IntegrationTestCase.java b/test/com/google/javascript/jscomp/IntegrationTestCase.java
index c7453ab9f50..58890c92db7 100644
--- a/test/com/google/javascript/jscomp/IntegrationTestCase.java
+++ b/test/com/google/javascript/jscomp/IntegrationTestCase.java
@@ -406,7 +406,11 @@ protected Compiler compile(CompilerOptions options, String original) {
   }
 
   protected Compiler compile(CompilerOptions options, String[] original) {
-    Compiler compiler = lastCompiler = new Compiler();
+    return compile(options, original, new Compiler());
+  }
+
+  protected Compiler compile(CompilerOptions options, String[] original, Compiler compiler) {
+    lastCompiler = compiler;
     BlackHoleErrorManager.silence(compiler);
     compiler.compileModules(
         externs,