diff --git a/core/src/test/java/org/infinispan/notifications/cachelistener/cluster/ClusterListenerFilterWithDependenciesTest.java b/core/src/test/java/org/infinispan/notifications/cachelistener/cluster/ClusterListenerFilterWithDependenciesTest.java
index <HASH>..<HASH> 100644
--- a/core/src/test/java/org/infinispan/notifications/cachelistener/cluster/ClusterListenerFilterWithDependenciesTest.java
+++ b/core/src/test/java/org/infinispan/notifications/cachelistener/cluster/ClusterListenerFilterWithDependenciesTest.java
@@ -46,6 +46,8 @@ public class ClusterListenerFilterWithDependenciesTest extends MultipleCacheMana
       cache(0).addListener(listener, filterConverter, filterConverter);
 
       assertEquals(NUM_ENTRIES, listener.createEvents.size());
+
+      cache(0).removeListener(listener);
    }
 
    public void testEventFilter() {
@@ -61,6 +63,8 @@ public class ClusterListenerFilterWithDependenciesTest extends MultipleCacheMana
 
       assertEquals(NUM_ENTRIES, cache(0).size());
       assertEquals(NUM_ENTRIES, listener.createEvents.size());
+
+      cache(0).removeListener(listener);
    }
 
    @Listener(clustered = true, includeCurrentState = true)
ISPN-<I> Remove listener at end of test