diff --git a/queue/queue_test.go b/queue/queue_test.go
index bd74dcc02..35f007cd5 100644
--- a/queue/queue_test.go
+++ b/queue/queue_test.go
@@ -14,7 +14,7 @@ func testQueueAddDrain(t *testing.T, size, numStart, numStop, numAdd, numDrain i
 		queue.Start()
 	}
 	for i := 0; i < numStop; i++ {
-		defer queue.Stop()
+		t.Cleanup(queue.Stop)
 	}
 
 	// Pushes should never block for long.