2 files changed, 15 insertions, 14 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/serialization/LabelCodecTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/serialization/LabelCodecTest.java
index b2a2d49619..745ad95edc 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/serialization/LabelCodecTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/serialization/LabelCodecTest.java
@@ -15,17 +15,17 @@
 package com.google.devtools.build.lib.skyframe.serialization;
 
 import com.google.devtools.build.lib.cmdline.Label;
-import com.google.devtools.build.lib.cmdline.LabelCodec;
-import com.google.devtools.build.lib.cmdline.LabelSyntaxException;
-import com.google.devtools.build.lib.skyframe.serialization.testutils.AbstractObjectCodecTest;
+import com.google.devtools.build.lib.skyframe.serialization.testutils.SerializationTester;
+import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 
-/** Basic tests for {@link LabelCodec}. */
+/** Basic tests for {@link Label}'s codec. */
 @RunWith(JUnit4.class)
-public class LabelCodecTest extends AbstractObjectCodecTest<Label> {
+public class LabelCodecTest {
 
-  public LabelCodecTest() throws LabelSyntaxException {
-    super(new LabelCodec(), Label.parseAbsolute("//foo/bar:baz"));
+  @Test
+  public void testCodec() throws Exception {
+    new SerializationTester(Label.parseAbsolute("//foo/bar:baz")).runTests();
   }
 }
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/serialization/PackageIdentifierCodecTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/serialization/PackageIdentifierCodecTest.java
index a9c9ff7449..7556177cf3 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/serialization/PackageIdentifierCodecTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/serialization/PackageIdentifierCodecTest.java
@@ -15,18 +15,19 @@
 package com.google.devtools.build.lib.skyframe.serialization;
 
 import com.google.devtools.build.lib.cmdline.PackageIdentifier;
-import com.google.devtools.build.lib.cmdline.PackageIdentifierCodec;
-import com.google.devtools.build.lib.skyframe.serialization.testutils.AbstractObjectCodecTest;
+import com.google.devtools.build.lib.skyframe.serialization.testutils.SerializationTester;
 import com.google.devtools.build.lib.vfs.PathFragment;
+import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 
-/** Basic tests for {@link PackageIdentifierCodec}. */
+/** Basic tests for {@link PackageIdentifier}'s codec. */
 @RunWith(JUnit4.class)
-public class PackageIdentifierCodecTest extends AbstractObjectCodecTest<PackageIdentifier> {
+public class PackageIdentifierCodecTest {
 
-  public PackageIdentifierCodecTest() throws Exception {
-    super(
-        new PackageIdentifierCodec(), PackageIdentifier.create("@foo", PathFragment.create("bar")));
+  @Test
+  public void testCodec() throws Exception {
+    new SerializationTester(PackageIdentifier.create("@foo", PathFragment.create("bar")))
+        .runTests();
   }
 }