diff --git a/.github/workflows/misc.yml b/.github/workflows/misc.yml
index 5c9da0e6a2caed..0a612249ab4d12 100644
--- a/.github/workflows/misc.yml
+++ b/.github/workflows/misc.yml
@@ -24,8 +24,10 @@ jobs:
       - name: Environment Information
         run: npx envinfo
       - name: Build
-        run: NODE=$(command -v node) make test-doc
+        run: NODE=$(command -v node) make doc-only
       - uses: actions/upload-artifact@v1
         with:
           name: docs
           path: out/doc
+      - name: Test
+        run: NODE=$(command -v node) make test-doc-ci
diff --git a/Makefile b/Makefile
index b6cf02b2b924d2..060ddf7542874a 100644
--- a/Makefile
+++ b/Makefile
@@ -63,9 +63,7 @@ V ?= 0
 # Use -e to double check in case it's a broken link
 # Use $(PWD) so we can cd to anywhere before calling this
 available-node = \
-	if [ -x $(NODE) ] && [ -e $(NODE) ]; then \
-		$(NODE) $(1); \
-	elif [ -x $(PWD)/$(NODE) ] && [ -e $(PWD)/$(NODE) ]; then \
+	if [ -x $(PWD)/$(NODE) ] && [ -e $(PWD)/$(NODE) ]; then \
 		$(PWD)/$(NODE) $(1); \
 	elif [ -x `command -v node` ] && [ -e `command -v node` ] && [ `command -v node` ]; then \
 		`command -v node` $(1); \
@@ -590,6 +588,11 @@ test-doc: doc-only lint-md ## Builds, lints, and verifies the docs.
 	fi
 	$(NODE) tools/doc/checkLinks.js .
 
+.PHONY: test-doc-ci
+test-doc-ci: doc-only
+	$(PYTHON) tools/test.py --shell $(NODE) $(PARALLEL_ARGS) doctool
+	$(NODE) tools/doc/checkLinks.js .
+
 test-known-issues: all
 	$(PYTHON) tools/test.py $(PARALLEL_ARGS) known_issues