diff --git a/pom.xml b/pom.xml
index 1045f5ab..f8b8369e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -40,7 +40,7 @@
         <java.version>21</java.version>
         <entur.google.pubsub.emulator.download.skip>true</entur.google.pubsub.emulator.download.skip>
 
-        <entur.helpers.version>2.20</entur.helpers.version>
+        <entur.helpers.version>2.21</entur.helpers.version>
 
         <entur-google-pubsub-version>${entur.helpers.version}</entur-google-pubsub-version>
         <gcp-storage.version>${entur.helpers.version}</gcp-storage.version>
diff --git a/src/test/java/no/entur/uttu/export/messaging/MessagingServiceTest.java b/src/test/java/no/entur/uttu/export/messaging/MessagingServiceTest.java
index cb3d322a..619228bc 100644
--- a/src/test/java/no/entur/uttu/export/messaging/MessagingServiceTest.java
+++ b/src/test/java/no/entur/uttu/export/messaging/MessagingServiceTest.java
@@ -16,8 +16,6 @@
 
 package no.entur.uttu.export.messaging;
 
-import static org.testcontainers.shaded.org.awaitility.Awaitility.await;
-
 import com.google.api.gax.core.CredentialsProvider;
 import com.google.api.gax.core.NoCredentialsProvider;
 import com.google.cloud.spring.pubsub.core.PubSubTemplate;
@@ -90,9 +88,7 @@ public void setup() {
 
   @After
   public void teardown() {
-    // Drain any messages that are still in the subscription so that they don't interfere with
-    // subsequent tests.
-    await().until(() -> subscriberTemplate.pullAndAck(queueName, 1000, true).isEmpty());
+    enturGooglePubSubAdmin.deleteAllSubscriptions();
   }
 
   // By default, autoconfiguration will initialize application default credentials.