diff --git a/pkg/service/docker_test.go b/pkg/service/docker_test.go
index 1168d5982..9fc5b90bb 100644
--- a/pkg/service/docker_test.go
+++ b/pkg/service/docker_test.go
@@ -75,7 +75,9 @@ func runRedis(t testing.TB) string {
 		t.Fatal(err)
 	}
 	t.Cleanup(func() {
-		_ = c.Close(t.Context())
+		// t.Context() is canceled before cleanup funcs run, so use a
+		// non-canceled context to let the container stop/remove complete.
+		_ = c.Close(context.Background())
 	})
 	addr := c.GetHostPort("6379/tcp")
 	waitTCPPort(t, addr)