diff --git a/function_test.go b/function_test.go
index afdb3f2a..d2c828e5 100644
--- a/function_test.go
+++ b/function_test.go
@@ -50,5 +50,7 @@ func TestFunction(t *testing.T) {
 	}()
 
 	// run service
-	fn.Run()
+	if err := fn.Run(); err != nil {
+		t.Fatal(err)
+	}
 }
diff --git a/service_test.go b/service_test.go
index e73c09a9..047f5d31 100644
--- a/service_test.go
+++ b/service_test.go
@@ -31,29 +31,33 @@ func TestService(t *testing.T) {
 	// service.Init()
 
 	// run service
-	go service.Run()
+	go func() {
+		// wait for start
+		wg.Wait()
 
-	// wait for start
-	wg.Wait()
+		// test call debug
+		req := service.Client().NewRequest(
+			"test.service",
+			"Debug.Health",
+			new(proto.HealthRequest),
+		)
 
-	// test call debug
-	req := service.Client().NewRequest(
-		"test.service",
-		"Debug.Health",
-		new(proto.HealthRequest),
-	)
+		rsp := new(proto.HealthResponse)
 
-	rsp := new(proto.HealthResponse)
+		err := service.Client().Call(context.TODO(), req, rsp)
+		if err != nil {
+			t.Fatal(err)
+		}
 
-	err := service.Client().Call(context.TODO(), req, rsp)
-	if err != nil {
+		if rsp.Status != "ok" {
+			t.Fatalf("service response: %s", rsp.Status)
+		}
+
+		// shutdown the service
+		cancel()
+	}()
+
+	if err := service.Run(); err != nil {
 		t.Fatal(err)
 	}
-
-	if rsp.Status != "ok" {
-		t.Fatalf("service response: %s", rsp.Status)
-	}
-
-	// shutdown the service
-	cancel()
 }