1 files changed, 3 insertions, 4 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/config/BuildConfigurationTest.java b/src/test/java/com/google/devtools/build/lib/analysis/config/BuildConfigurationTest.java
index d3a1d4d764..26b1d1eec6 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/config/BuildConfigurationTest.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/config/BuildConfigurationTest.java
@@ -29,8 +29,8 @@ import com.google.devtools.build.lib.packages.NoSuchTargetException;
 import com.google.devtools.build.lib.rules.cpp.CppConfiguration;
 import com.google.devtools.build.lib.rules.java.JavaConfiguration;
 import com.google.devtools.build.lib.rules.objc.J2ObjcConfiguration;
-import com.google.devtools.build.lib.skyframe.serialization.InjectingObjectCodecAdapter;
 import com.google.devtools.build.lib.skyframe.serialization.testutils.ObjectCodecTester;
+import com.google.devtools.build.lib.vfs.FileSystem;
 import com.google.devtools.common.options.Options;
 import java.util.Map;
 import java.util.regex.Pattern;
@@ -430,9 +430,7 @@ public class BuildConfigurationTest extends ConfigurationTestCase {
 
   @Test
   public void testCodec() throws Exception {
-    ObjectCodecTester.newBuilder(
-            new InjectingObjectCodecAdapter<>(
-                BuildConfiguration.CODEC, () -> getScratch().getFileSystem()))
+    ObjectCodecTester.newBuilder(BuildConfiguration.CODEC)
         .addSubjects(
             create(),
             create("--cpu=piii"),
@@ -453,6 +451,7 @@ public class BuildConfigurationTest extends ConfigurationTestCase {
                 "qspace=a\\ quoted\\ space",
                 "--define",
                 "#a=pounda"))
+        .addDependency(FileSystem.class, getScratch().getFileSystem())
         .verificationFunction(BuildConfigurationTest::verifyDeserialized)
         .buildAndRunTests();
   }