diff --git a/google-cloud-pubsub/acceptance/pubsub_helper.rb b/google-cloud-pubsub/acceptance/pubsub_helper.rb
index <HASH>..<HASH> 100644
--- a/google-cloud-pubsub/acceptance/pubsub_helper.rb
+++ b/google-cloud-pubsub/acceptance/pubsub_helper.rb
@@ -91,9 +91,8 @@ end
 
 def clean_up_pubsub_snapshots
   puts "Cleaning up pubsub snapshots after tests."
-  snapshots = $pubsub.snapshots
-  $snapshot_names.each do |snapshot_name|
-    if snapshot = (snapshots.detect { |s| s.name.split("/").last == snapshot_name })
+  $pubsub.snapshots.all do |snapshot|
+    if snapshot.name.include? $snapshot_prefix
       snapshot.delete
     end
   end
Update Pub/Sub cleanup

We continue to see Pub/Sub snapshots reach the limit. Update the cleanup
so that it calls #all so the records are returned so they can be deleted.