diff --git a/core/src/test/java/google/registry/model/EntityTestCase.java b/core/src/test/java/google/registry/model/EntityTestCase.java
index d36dfb204..c9c43f2b2 100644
--- a/core/src/test/java/google/registry/model/EntityTestCase.java
+++ b/core/src/test/java/google/registry/model/EntityTestCase.java
@@ -49,6 +49,16 @@ import org.junit.jupiter.api.extension.RegisterExtension;
 /** Base class of all unit tests for entities which are persisted to Datastore via Objectify. */
 public abstract class EntityTestCase {
 
+  protected enum JpaEntityCoverageCheck {
+    /**
+     * The test will contribute to the coverage checks in {@link
+     * google.registry.schema.integration.SqlIntegrationTestSuite}.
+     */
+    ENABLED,
+    /** The test is not relevant for JPA coverage checks. */
+    DISABLED;
+  }
+
   protected FakeClock fakeClock = new FakeClock(DateTime.now(UTC));
 
   @Rule @RegisterExtension public final AppEngineRule appEngine;
@@ -56,14 +66,14 @@ public abstract class EntityTestCase {
   @Rule @RegisterExtension public InjectRule inject = new InjectRule();
 
   protected EntityTestCase() {
-    this(false);
+    this(JpaEntityCoverageCheck.DISABLED);
   }
 
-  protected EntityTestCase(boolean enableJpaEntityCheck) {
+  protected EntityTestCase(JpaEntityCoverageCheck jpaEntityCoverageCheck) {
     appEngine =
         AppEngineRule.builder()
             .withDatastoreAndCloudSql()
-            .enableJpaEntityCoverageCheck(enableJpaEntityCheck)
+            .enableJpaEntityCoverageCheck(jpaEntityCoverageCheck == JpaEntityCoverageCheck.ENABLED)
             .withClock(fakeClock)
             .build();
   }
diff --git a/core/src/test/java/google/registry/model/billing/BillingEventTest.java b/core/src/test/java/google/registry/model/billing/BillingEventTest.java
index 8dceeac5b..b83dce387 100644
--- a/core/src/test/java/google/registry/model/billing/BillingEventTest.java
+++ b/core/src/test/java/google/registry/model/billing/BillingEventTest.java
@@ -51,7 +51,7 @@ public class BillingEventTest extends EntityTestCase {
   private final DateTime now = DateTime.now(UTC);
 
   public BillingEventTest() {
-    super(true);
+    super(JpaEntityCoverageCheck.ENABLED);
   }
 
   HistoryEntry historyEntry;
diff --git a/core/src/test/java/google/registry/model/contact/ContactResourceTest.java b/core/src/test/java/google/registry/model/contact/ContactResourceTest.java
index c90c2c0fd..9259ead89 100644
--- a/core/src/test/java/google/registry/model/contact/ContactResourceTest.java
+++ b/core/src/test/java/google/registry/model/contact/ContactResourceTest.java
@@ -49,7 +49,7 @@ public class ContactResourceTest extends EntityTestCase {
   ContactResource contactResource;
 
   public ContactResourceTest() {
-    super(true);
+    super(JpaEntityCoverageCheck.ENABLED);
   }
 
   @BeforeEach
diff --git a/core/src/test/java/google/registry/model/history/ContactHistoryTest.java b/core/src/test/java/google/registry/model/history/ContactHistoryTest.java
index 75bdea225..1cf1365dc 100644
--- a/core/src/test/java/google/registry/model/history/ContactHistoryTest.java
+++ b/core/src/test/java/google/registry/model/history/ContactHistoryTest.java
@@ -32,7 +32,7 @@ import org.junit.jupiter.api.Test;
 public class ContactHistoryTest extends EntityTestCase {
 
   public ContactHistoryTest() {
-    super(true);
+    super(JpaEntityCoverageCheck.ENABLED);
   }
 
   @Test
diff --git a/core/src/test/java/google/registry/model/history/HostHistoryTest.java b/core/src/test/java/google/registry/model/history/HostHistoryTest.java
index 9ce044254..0a3b5edc9 100644
--- a/core/src/test/java/google/registry/model/history/HostHistoryTest.java
+++ b/core/src/test/java/google/registry/model/history/HostHistoryTest.java
@@ -32,7 +32,7 @@ import org.junit.jupiter.api.Test;
 public class HostHistoryTest extends EntityTestCase {
 
   public HostHistoryTest() {
-    super(true);
+    super(JpaEntityCoverageCheck.ENABLED);
   }
 
   @Test
diff --git a/core/src/test/java/google/registry/model/poll/PollMessageTest.java b/core/src/test/java/google/registry/model/poll/PollMessageTest.java
index e2409b99e..3dfea9b63 100644
--- a/core/src/test/java/google/registry/model/poll/PollMessageTest.java
+++ b/core/src/test/java/google/registry/model/poll/PollMessageTest.java
@@ -39,7 +39,7 @@ public class PollMessageTest extends EntityTestCase {
   PollMessage.Autorenew autoRenew;
 
   public PollMessageTest() {
-    super(true);
+    super(JpaEntityCoverageCheck.ENABLED);
   }
 
   @BeforeEach
diff --git a/core/src/test/java/google/registry/model/registry/RegistryLockDaoTest.java b/core/src/test/java/google/registry/model/registry/RegistryLockDaoTest.java
index 0df2a5805..2802b68a4 100644
--- a/core/src/test/java/google/registry/model/registry/RegistryLockDaoTest.java
+++ b/core/src/test/java/google/registry/model/registry/RegistryLockDaoTest.java
@@ -36,7 +36,7 @@ import org.junit.jupiter.api.Test;
 public final class RegistryLockDaoTest extends EntityTestCase {
 
   public RegistryLockDaoTest() {
-    super(true);
+    super(JpaEntityCoverageCheck.ENABLED);
   }
 
   @Test
diff --git a/core/src/test/java/google/registry/model/reporting/Spec11ThreatMatchTest.java b/core/src/test/java/google/registry/model/reporting/Spec11ThreatMatchTest.java
index 693214bd7..741c9b9d5 100644
--- a/core/src/test/java/google/registry/model/reporting/Spec11ThreatMatchTest.java
+++ b/core/src/test/java/google/registry/model/reporting/Spec11ThreatMatchTest.java
@@ -47,7 +47,7 @@ public class Spec11ThreatMatchTest extends EntityTestCase {
   private ContactResource registrantContact;
 
   public Spec11ThreatMatchTest() {
-    super(true);
+    super(JpaEntityCoverageCheck.ENABLED);
   }
 
   @BeforeEach