diff --git a/Makefile b/Makefile
index 9d85575e..e5cbf771 100644
--- a/Makefile
+++ b/Makefile
@@ -3659,7 +3659,7 @@ sizelint:
 peellint:
 	@sh tools/peellint
 
-test: all sizelint peellint $(TESTS) test-lang-byteid
+test: all sizelint peellint $(TESTS) test-lang test-lang-byteid
 	@WW=$(BIN)/ww BIN=$(BIN) sh test/run
 
 test-unit: all sizelint peellint $(TESTS)
@@ -3683,7 +3683,7 @@ test-run: all
 # NOT yet wired into `make test` (fold 6, gated on the T1 corpus).
 test-lang: all
 	@set -e; for f in $(wildcard test/lang/*_test.ww); do \
-		echo "ww test $$f"; $(BIN)/ww test $$f; \
+		echo "ww test $$f"; WW_PKGCACHE=$(OUT)/langcache $(BIN)/ww test $$f; \
 	done; echo "test-lang: all ok"
 
 # ---- test-lang-byteid: T2 cross-stage .s byte-id gate (fold 4) ---------
@@ -3754,7 +3754,7 @@ test-lang-byteid: all
 # silent skip. NOT a substitute for the push bar: `make test` stays the
 # no-skip bootstrap gate. Cache lives in out/.testcache (gitignored, wiped
 # by `make clean`); a green `make test` primes it. See test/run.
-test-commit: all sizelint peellint $(TESTS)
+test-commit: all sizelint peellint $(TESTS) test-lang
 	@WW=$(BIN)/ww BIN=$(BIN) COMMIT=1 sh test/run
 
 # ---- smoke: inner-loop cross-stage byte-id check on a SMALL input ------