diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 2cc71ea35..a6f7cf2ea 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -10,22 +10,9 @@ jobs:
     uses: networkservicemesh/.github/.github/workflows/yamllint.yaml@main
 
   build-and-test:
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        # tests need to be run as root (with sudo), windows doesn't support it
-        os: ["windows-latest"]
-    steps:
-      - name: Check out code
-        uses: actions/checkout@v2
-      - name: Setup Go
-        uses: actions/setup-go@v1
-        with:
-          go-version: 1.18.1
-      - name: Build
-        run: go build -race  ./...
-      - name: Test
-        run: go test -race -run ^TestHealClient_FindTest$ github.com/networkservicemesh/sdk/pkg/registry/common/heal -count 35000 -timeout 6h
+    uses: networkservicemesh/.github/.github/workflows/build-and-test.yaml@main
+    with:
+      os: '["ubuntu-latest", "macos-latest", "windows-latest"]'
 
   golangci-lint:
     uses: networkservicemesh/.github/.github/workflows/golangci-lint.yaml@main
diff --git a/pkg/registry/common/heal/find_test.go b/pkg/registry/common/heal/find_test.go
index 9fdb8dc75..91d21ad7f 100644
--- a/pkg/registry/common/heal/find_test.go
+++ b/pkg/registry/common/heal/find_test.go
@@ -131,10 +131,10 @@ func TestHealClient_FindTest(t *testing.T) {
 	require.Eventually(t, func() bool {
 		_, err := nsRespStream.Recv()
 		return err != nil
-	}, time.Second*2, time.Millisecond*30)
+	}, 2*time.Second, time.Millisecond*30)
 
 	require.Eventually(t, func() bool {
 		_, err := nseRespStream.Recv()
 		return err != nil
-	}, time.Second*2, time.Millisecond*30)
+	}, 2*time.Second, time.Millisecond*30)
 }