diff --git a/.make/go.mk b/.make/go.mk
index 3da4754f8..9469448bd 100644
--- a/.make/go.mk
+++ b/.make/go.mk
@@ -78,7 +78,6 @@ ci-golangci-lint: $(GOLANGCI_LINT)
 
 .PHONY: test
 test:
-	@make -C ../ generate
 	@go test -v -coverprofile coverage.out ./...
 
 .PHONY: go-coverage
diff --git a/ocs/Makefile b/ocs/Makefile
index 0bfbe80f2..f4fcaa9ab 100644
--- a/ocs/Makefile
+++ b/ocs/Makefile
@@ -26,4 +26,14 @@ ci-go-generate: # CI runs ci-node-generate automatically before this target
 	@go generate ./...
 
 .PHONY: ci-node-generate
-ci-node-generate:
+ci-node-generate: yarn-build
+
+.PHONY: yarn-build
+yarn-build: node_modules
+	yarn lint
+	yarn test
+	yarn build
+
+.PHONY: node_modules
+node_modules:
+	yarn install --frozen-lockfile