diff --git a/generate-linuxcnc-switchkins-remap-table.sh b/generate-linuxcnc-switchkins-remap-table.sh
index 938b62f..b9fdc45 100755
--- a/generate-linuxcnc-switchkins-remap-table.sh
+++ b/generate-linuxcnc-switchkins-remap-table.sh
@@ -59,6 +59,7 @@ if [[ ! -f "$manifest" ]]; then
     echo "missing kinematics manifest: $manifest" >&2
     exit 1
 fi
+LINUXCNC_ROOT="$linuxcnc_root" ./check-linuxcnc-inputs-cached.sh "$manifest"
 if [[ "$mode" == all && -z "$all_output_dir" ]]; then
     echo "missing output directory for --all-output-dir" >&2
     exit 1
diff --git a/test-all-native.sh b/test-all-native.sh
index a8ee51b..f7d166c 100755
--- a/test-all-native.sh
+++ b/test-all-native.sh
@@ -86,6 +86,7 @@ grep -F 'missing LinuxCNC switchkins REMAP INI in manifest:' check-linuxcnc-swit
 grep -F 'missing LinuxCNC switchkins remap source in manifest:' check-linuxcnc-switchkins-remap-table.sh >/dev/null
 grep -F 'LinuxCNC source basis: cached switchkins/remap validation hashes the LinuxCNC' check-linuxcnc-switchkins-remap-table-cached.sh >/dev/null
 grep -F 'LinuxCNC source basis: generated switchkins/remap tables are extracted from' generate-linuxcnc-switchkins-remap-table.sh >/dev/null
+grep -F 'LINUXCNC_ROOT="$linuxcnc_root" ./check-linuxcnc-inputs-cached.sh "$manifest"' generate-linuxcnc-switchkins-remap-table.sh >/dev/null
 grep -F 'LinuxCNC source basis: Puma560 DH parameter output is generated from' generate-linuxcnc-puma560-dh-parameters.sh >/dev/null
 grep -F 'LinuxCNC source basis: all-native guardrails lock source-backed manifests' test-all-native.sh >/dev/null
 test -x check-linuxcnc-inputs-cached.sh
diff --git a/test-native.sh b/test-native.sh
index 099bc95..773432e 100755
--- a/test-native.sh
+++ b/test-native.sh
@@ -60,6 +60,7 @@ grep -F 'missing LinuxCNC switchkins REMAP INI in manifest:' check-linuxcnc-swit
 grep -F 'missing LinuxCNC switchkins remap source in manifest:' check-linuxcnc-switchkins-remap-table.sh >/dev/null
 grep -F 'LinuxCNC source basis: cached switchkins/remap validation hashes the LinuxCNC' check-linuxcnc-switchkins-remap-table-cached.sh >/dev/null
 grep -F 'LinuxCNC source basis: generated switchkins/remap tables are extracted from' generate-linuxcnc-switchkins-remap-table.sh >/dev/null
+grep -F 'LINUXCNC_ROOT="$linuxcnc_root" ./check-linuxcnc-inputs-cached.sh "$manifest"' generate-linuxcnc-switchkins-remap-table.sh >/dev/null
 grep -F 'LinuxCNC source basis: Puma560 DH parameter output is generated from' generate-linuxcnc-puma560-dh-parameters.sh >/dev/null
 grep -F 'LinuxCNC source basis: all-native guardrails lock source-backed manifests' test-all-native.sh >/dev/null
 grep -F 'LinuxCNC source basis: this probe derives required Python C API exports from' test-linuxcnc-wasm-python-c-api-symbols.sh >/dev/null