diff --git a/service_test.go b/service_test.go
index 6dcc19cc..29e979f8 100644
--- a/service_test.go
+++ b/service_test.go
@@ -30,10 +30,16 @@ func TestService(t *testing.T) {
 	// we can't test service.Init as it parses the command line
 	// service.Init()
 
-	// register handler
-	// do that later
+	t.Run("Run", func(t *testing.T) {
+		t.Parallel()
+
+		// run service
+		service.Run()
+	})
+
+	t.Run("Debug.Health", func(t *testing.T) {
+		t.Parallel()
 
-	go func() {
 		// wait for start
 		wg.Wait()
 
@@ -57,8 +63,5 @@ func TestService(t *testing.T) {
 
 		// shutdown the service
 		cancel()
-	}()
-
-	// run service
-	service.Run()
+	})
 }