diff --git a/full_test.sh b/full_test.sh
index 72b15170..7aba236e 100755
--- a/full_test.sh
+++ b/full_test.sh
@@ -40,7 +40,7 @@ fi
 # shouldn't be tested (e.g. we exclude the base configs and some specialized
 # tests)
 echo "Running regular tests" | tee -a $LOGNAME
-BULK_EXCLUDE="(br-base|fedora-base|incremental|clean|timeout-build|timeout-run)"
+BULK_EXCLUDE="(br-base|fedora-base|incremental|clean|timeout-build|timeout-run|bare|dummy-bare|spike-jobs|spike)"
 ./marshal clean test/!$BULK_EXCLUDE.json | tee -a $LOGNAME
 ./marshal test test/!$BULK_EXCLUDE.json | tee -a $LOGNAME
 if [ ${PIPESTATUS[0]} != 0 ]; then
@@ -50,12 +50,24 @@ else
   echo "Success" | tee -a $LOGNAME
 fi
 
+# These tests need to run on spike, but not with the initramfs option
+echo "Running bare-metal tests" | tee -a $LOGNAME
+IS_INCLUDE="@(bare|dummy-bare|spike|spike-jobs)"
+./marshal clean test/$IS_INCLUDE.json | tee -a $LOGNAME
+# This is a temporary workaround for bug #38
+./marshal build test/spike.json
+./marshal test -s test/$IS_INCLUDE.json | tee -a $LOGNAME
+if [ ${PIPESTATUS[0]} != 0 ]; then
+  echo "Failure" | tee -a $LOGNAME
+  SUITE_PASS=false
+else
+  echo "Success" | tee -a $LOGNAME
+fi
+
 # Run the initramfs versions on spike, initramfs runs have many restrictions,
 # we only run a few tests here to test basic capabilities
 echo "Running initramfs capable tests on spike" | tee -a $LOGNAME
 IS_INCLUDE="@(command|flist|host-init|jobs|linux-src|overlay|post-run-hook|run|smoke0)"
-# ls test/$IS_INCLUDE.json
-# exit 0
 ./marshal -i clean test/$IS_INCLUDE.json | tee -a $LOGNAME
 ./marshal -i test -s test/$IS_INCLUDE.json | tee -a $LOGNAME
 if [ ${PIPESTATUS[0]} != 0 ]; then
diff --git a/marshal b/marshal
index 33264e77..21764355 100755
--- a/marshal
+++ b/marshal
@@ -70,7 +70,9 @@ def main():
 
     if args.command == 'test':
         suitePass = True
-
+        
+    skipCount = 0
+    failCount = 0
     for cfgPath in args.config_files:
         # Each config gets it's own logging output and results directory
         wlutil.setRunName(cfgPath, args.command)
@@ -114,8 +116,6 @@ def main():
                 log.exception("Failed to launch workload:")
 
         elif args.command == "test":
-            skipCount = 0
-            failCount = 0
             log.info("Running: " + cfgPath)
             res = wlutil.testWorkload(cfgPath, cfgs, args.verbose, spike=args.spike, cmp_only=args.manual)
             if res is wlutil.testResult.failure: