diff --git a/backend/internal/service/notification_delivery_lifecycle_test.go b/backend/internal/service/notification_delivery_lifecycle_test.go
index 186ca128..d8e8e8ba 100644
--- a/backend/internal/service/notification_delivery_lifecycle_test.go
+++ b/backend/internal/service/notification_delivery_lifecycle_test.go
@@ -221,15 +221,15 @@ func TestNotificationShutdownWaitsForRedisStreamXAck(t *testing.T) {
 	require.NoError(t, publisherClient.Ping(context.Background()).Err())
 
 	releaseAck()
+	select {
+	case <-gate.done:
+	case <-time.After(5 * time.Second):
+		t.Fatal("timed out waiting for XAck completion")
+	}
 	releaseSubscriberClose()
 	require.NoError(t, <-closeDone)
 	require.NoError(t, <-runDone)
 	handlers.Stop()
-	select {
-	case <-gate.done:
-	default:
-		t.Fatal("router closed without completing XAck")
-	}
 	pending, err = publisherClient.XPending(context.Background(), topic, gate.group).Result()
 	require.NoError(t, err)
 	require.Zero(t, pending.Count)