diff --git a/tools/apply-test.sh b/tools/apply-test.sh
index 09cf7562c5..3e6e376494 100755
--- a/tools/apply-test.sh
+++ b/tools/apply-test.sh
@@ -49,8 +49,13 @@ fi
 FOUND=0
 for f in `find applytest -name 'puppetapplytest*' -print` ; do
     if grep -q "Node-OS: $CODENAME" $f; then
-        cat applytest/head $f > $f.final
-        FOUND=1
+        if grep -q "Puppet-Version: !${PUPPET_VERSION}" $f; then
+            echo "Skipping $f due to unsupported puppet version"
+            continue
+        else
+            cat applytest/head $f > $f.final
+            FOUND=1
+        fi
     fi
 done