diff --git a/javatests/google/registry/testing/AbstractDomainBaseSubject.java b/javatests/google/registry/testing/AbstractDomainBaseSubject.java
deleted file mode 100644
index b96abc56a..000000000
--- a/javatests/google/registry/testing/AbstractDomainBaseSubject.java
+++ /dev/null
@@ -1,69 +0,0 @@
-// Copyright 2017 The Nomulus Authors. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package google.registry.testing;
-
-import com.google.common.collect.ImmutableSet;
-import com.google.common.truth.FailureMetadata;
-import google.registry.model.domain.DomainBase;
-import google.registry.model.domain.launch.LaunchNotice;
-import google.registry.model.domain.secdns.DelegationSignerData;
-import google.registry.model.eppcommon.AuthInfo;
-import google.registry.testing.TruthChainer.And;
-import java.util.Set;
-
-/** Truth subject for asserting things about {@link DomainBase} instances. */
-public abstract class AbstractDomainBaseSubject
-    <T extends DomainBase, S extends AbstractDomainBaseSubject<T, S>>
-    extends AbstractEppResourceSubject<T, S> {
-
-  private final T actual;
-
-  public AbstractDomainBaseSubject(FailureMetadata failureMetadata, T subject) {
-    super(failureMetadata, subject);
-    this.actual = subject;
-  }
-
-  public And<S> hasFullyQualifiedDomainName(String fullyQualifiedDomainName) {
-    return hasValue(
-        fullyQualifiedDomainName,
-        actual.getFullyQualifiedDomainName(),
-        "has fullyQualifiedDomainName");
-  }
-
-  public And<S> hasExactlyDsData(DelegationSignerData... dsData) {
-    return hasExactlyDsData(ImmutableSet.copyOf(dsData));
-  }
-
-  public And<S> hasExactlyDsData(Set<DelegationSignerData> dsData) {
-    return hasValue(dsData, actual.getDsData(), "has dsData");
-  }
-
-  public And<S> hasNumDsData(int num) {
-    return hasValue(num, actual.getDsData().size(), "has num dsData");
-  }
-
-  public And<S> hasLaunchNotice(LaunchNotice launchNotice) {
-    return hasValue(launchNotice, actual.getLaunchNotice(), "has launchNotice");
-  }
-
-  public And<S> hasAuthInfoPwd(String pw) {
-    AuthInfo authInfo = actual.getAuthInfo();
-    return hasValue(pw, authInfo == null ? null : authInfo.getPw().getValue(), "has auth info pw");
-  }
-
-  public And<S> hasCurrentSponsorClientId(String clientId) {
-    return hasValue(clientId, actual.getCurrentSponsorClientId(), "has currentSponsorClientId");
-  }
-}
diff --git a/javatests/google/registry/testing/DomainBaseSubject.java b/javatests/google/registry/testing/DomainBaseSubject.java
index 65da1470c..a2c7ab21a 100644
--- a/javatests/google/registry/testing/DomainBaseSubject.java
+++ b/javatests/google/registry/testing/DomainBaseSubject.java
@@ -18,16 +18,60 @@ import static com.google.common.base.Preconditions.checkNotNull;
 import static com.google.common.truth.Fact.simpleFact;
 import static com.google.common.truth.Truth.assertAbout;
 
+import com.google.common.collect.ImmutableSet;
 import com.google.common.truth.FailureMetadata;
 import com.google.common.truth.SimpleSubjectBuilder;
 import google.registry.model.domain.DomainBase;
+import google.registry.model.domain.launch.LaunchNotice;
+import google.registry.model.domain.secdns.DelegationSignerData;
+import google.registry.model.eppcommon.AuthInfo;
 import google.registry.testing.TruthChainer.And;
 import java.util.Objects;
+import java.util.Set;
 import org.joda.time.DateTime;
 
 /** Truth subject for asserting things about {@link DomainBase} instances. */
 public final class DomainBaseSubject
-    extends AbstractDomainBaseSubject<DomainBase, DomainBaseSubject> {
+    extends AbstractEppResourceSubject<DomainBase, DomainBaseSubject> {
+
+  private final DomainBase actual;
+
+  public DomainBaseSubject(FailureMetadata failureMetadata, DomainBase subject) {
+    super(failureMetadata, checkNotNull(subject));
+    this.actual = subject;
+  }
+
+  public And<DomainBaseSubject> hasFullyQualifiedDomainName(String fullyQualifiedDomainName) {
+    return hasValue(
+        fullyQualifiedDomainName,
+        actual.getFullyQualifiedDomainName(),
+        "has fullyQualifiedDomainName");
+  }
+
+  public And<DomainBaseSubject> hasExactlyDsData(DelegationSignerData... dsData) {
+    return hasExactlyDsData(ImmutableSet.copyOf(dsData));
+  }
+
+  public And<DomainBaseSubject> hasExactlyDsData(Set<DelegationSignerData> dsData) {
+    return hasValue(dsData, actual.getDsData(), "has dsData");
+  }
+
+  public And<DomainBaseSubject> hasNumDsData(int num) {
+    return hasValue(num, actual.getDsData().size(), "has num dsData");
+  }
+
+  public And<DomainBaseSubject> hasLaunchNotice(LaunchNotice launchNotice) {
+    return hasValue(launchNotice, actual.getLaunchNotice(), "has launchNotice");
+  }
+
+  public And<DomainBaseSubject> hasAuthInfoPwd(String pw) {
+    AuthInfo authInfo = actual.getAuthInfo();
+    return hasValue(pw, authInfo == null ? null : authInfo.getPw().getValue(), "has auth info pw");
+  }
+
+  public And<DomainBaseSubject> hasCurrentSponsorClientId(String clientId) {
+    return hasValue(clientId, actual.getCurrentSponsorClientId(), "has currentSponsorClientId");
+  }
 
   public And<DomainBaseSubject> hasRegistrationExpirationTime(DateTime expiration) {
     if (!Objects.equals(actual.getRegistrationExpirationTime(), expiration)) {
@@ -63,13 +107,6 @@ public final class DomainBaseSubject
     return hasValue(smdId, actual.getSmdId(), "has smdId");
   }
 
-  private final DomainBase actual;
-
-  public DomainBaseSubject(FailureMetadata failureMetadata, DomainBase subject) {
-    super(failureMetadata, checkNotNull(subject));
-    this.actual = subject;
-  }
-
   public static SimpleSubjectBuilder<DomainBaseSubject, DomainBase> assertAboutDomains() {
     return assertAbout(DomainBaseSubject::new);
   }