diff --git a/test-nonironic.sh b/test-nonironic.sh
index 1b0ba93b71a673e57a0af1a5e96bc28799719a29..9659171173acbd0d3a308cf84ce7965ff4620db6 100755
--- a/test-nonironic.sh
+++ b/test-nonironic.sh
@@ -43,6 +43,7 @@ for f in "${FLAVOR[@]}"; do
   testCreate "${TESTTYPE}-${f}" "create"
   testCreate "${TESTTYPE}-${f}" "install"
   testCreate "${TESTTYPE}-${f}" "ssh_access"
+  testCreate "${TESTTYPE}-${f}" "puppet_tests"
 done
 
 # Poor man's FIFO queue
@@ -250,6 +251,18 @@ while [[ ${#TOBETESTED[@]} -gt 0 ]]; do
     runOnServer "${p_name}" "fdisk -l; cat /proc/mdstat"
     t_CheckExitStatus $?
 
+    t_Log "We're in! Running Puppet tests"
+    testStart "${TESTTYPE}-${flavor}" "puppet_tests"
+    runOnServer "${p_name}" "PUPPET_TEST_TOKEN="${PUPPET_TEST_TOKEN}" bash -s" < ./puppettests.sh
+    g=$?
+    t_CheckExitStatus $g
+    if [[ $g -ne 0 ]]; then
+      testEnd "${TESTTYPE}-${flavor}" "puppet_tests" $TEST_FAIL
+      testAddComments "${TESTTYPE}-${flavor}" "puppet_tests" "Puppet tests failed"
+    else
+      testEnd "${TESTTYPE}-${flavor}" "puppet_tests" $TEST_PASS
+    fi
+
     # Remove the server
     aimsDelete "${p_name}" "${TESTTYPE}-${flavor}" "ssh_access"
     deleteServer "${p_name}" "${TESTTYPE}-${flavor}" "ssh_access"