diff --git a/hapi-fhir-jpaserver-subscription/src/test/java/ca/uhn/fhir/jpa/subscription/module/cache/BaseSubscriptionRegistryTest.java b/hapi-fhir-jpaserver-subscription/src/test/java/ca/uhn/fhir/jpa/subscription/module/cache/BaseSubscriptionRegistryTest.java
index e7a43b63148..382237be8aa 100644
--- a/hapi-fhir-jpaserver-subscription/src/test/java/ca/uhn/fhir/jpa/subscription/module/cache/BaseSubscriptionRegistryTest.java
+++ b/hapi-fhir-jpaserver-subscription/src/test/java/ca/uhn/fhir/jpa/subscription/module/cache/BaseSubscriptionRegistryTest.java
@@ -26,7 +26,7 @@ public abstract class BaseSubscriptionRegistryTest extends BaseSubscriptionDstu3
 	}
 
 	public boolean registryEmpty() {
-		return mySubscriptionChannelRegistry.size() == 0;
+		return mySubscriptionRegistry.size() == 0 && mySubscriptionChannelRegistry.size() == 0;
 	}
 
 	protected Subscription createSubscription() {