diff --git a/graph-explorer/Makefile b/graph-explorer/Makefile
index e5ab1994f..d91c24968 100644
--- a/graph-explorer/Makefile
+++ b/graph-explorer/Makefile
@@ -26,7 +26,17 @@ ci-go-generate: pull-assets # CI runs ci-node-generate automatically before this
 	@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
 
 .PHONY: pull-assets
 pull-assets:
diff --git a/web/Makefile b/web/Makefile
index f9ea026e8..0c0105c42 100644
--- a/web/Makefile
+++ b/web/Makefile
@@ -26,7 +26,17 @@ ci-go-generate: pull-assets # CI runs ci-node-generate automatically before this
 	@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
 
 WEB_ASSETS_VERSION = v4.3.0