diff --git a/services/syncbase/testutil/util.go b/services/syncbase/testutil/util.go
index 7af6f70..a3a8c72 100644
--- a/services/syncbase/testutil/util.go
+++ b/services/syncbase/testutil/util.go
@@ -249,7 +249,8 @@
 	name := s.Status().Endpoints[0].Name()
 	return name, func() {
 		cancel()
-		<-s.Closed()
+		s.Stop()
+		service.Close()
 		os.RemoveAll(rootDir)
 	}
 }