diff --git a/test.sh b/test.sh
index 1bc035bd8a..dc8ebe3e4b 100755
--- a/test.sh
+++ b/test.sh
@@ -8,7 +8,14 @@ if [ ! -d applytest ] ; then
 fi
 
 csplit -sf applytest/puppetapplytest manifests/site.pp '/^$/' {*}
-sed -i -e 's/^[^[:space:]]/#&/g' applytest/puppetapplytest*
+sed -i -e 's/^[^][:space:]$]/#&/g' applytest/puppetapplytest*
 sed -i -e 's@hiera(.\([^.]*\).,\([^)]*\))@\2@' applytest/puppetapplytest*
+mv applytest/*00 applytest/head  # These are the top-level variables defined in site.pp
 
-find applytest -name 'puppetapplytest*' -print0 | xargs -0 -P $(nproc) -n 1 -I filearg sudo puppet apply --modulepath=${MODULE_PATH} --noop --verbose --debug filearg > /dev/null
+for f in `find applytest -name 'puppetapplytest*' -print` ; do
+    cat applytest/head $f > $f.final
+done
+
+find applytest -name 'puppetapplytest*.final' -print0 | \
+    xargs -0 -P $(nproc) -n 1 -I filearg \
+        sudo puppet apply --modulepath=${MODULE_PATH} --noop --verbose --debug filearg > /dev/null