diff --git a/Makefile b/Makefile
index 9ee1af24e..d32863930 100644
--- a/Makefile
+++ b/Makefile
@@ -132,6 +132,7 @@ go-mod-tidy:
 .PHONY: test
 test:
 	@for mod in $(OCIS_MODULES); do \
+        $(MAKE) --no-print-directory -C $$mod ci-node-generate; \
         $(MAKE) --no-print-directory -C $$mod test; \
     done
 
diff --git a/graph-explorer/Makefile b/graph-explorer/Makefile
index 43541bedd..7c8b57ad2 100644
--- a/graph-explorer/Makefile
+++ b/graph-explorer/Makefile
@@ -28,7 +28,6 @@ ci-go-generate: pull-assets # CI runs ci-node-generate automatically before this
 .PHONY: ci-node-generate
 ci-node-generate:
 	yarn install --frozen-lockfile
-	yarn build
 
 .PHONY: pull-assets
 pull-assets:
diff --git a/web/Makefile b/web/Makefile
index 0f601f90b..a3a0452ef 100644
--- a/web/Makefile
+++ b/web/Makefile
@@ -28,7 +28,6 @@ ci-go-generate: pull-assets # CI runs ci-node-generate automatically before this
 .PHONY: ci-node-generate
 ci-node-generate:
 	yarn install --frozen-lockfile
-	yarn build
 
 WEB_ASSETS_VERSION = v4.3.0