diff --git a/tools/testbuild.sh b/tools/testbuild.sh
index 1cc92b5f0b..a44a23fcb1 100755
--- a/tools/testbuild.sh
+++ b/tools/testbuild.sh
@@ -257,6 +257,10 @@ function build {
     xargs -I "{}" cp "{}" $artifactconfigdir < $nuttx/nuttx.manifest
   fi
 
+  return $fail
+}
+
+function refresh {
   # Ensure defconfig in the canonical form
 
   if ! ./tools/refresh.sh --silent $config; then
@@ -300,10 +304,11 @@ function dotest {
   config=`echo $1 | cut -d',' -f1`
   check=${HOST},${config/\//:}
 
+  skip=0
   for re in $blacklist; do
     if [[ "${check}" =~ ${re:1}$ ]]; then
       echo "Skipping: $1"
-      return
+      skip=1
     fi
   done
 
@@ -346,8 +351,11 @@ function dotest {
   echo "------------------------------------------------------------------------------------"
   distclean
   configure
-  build
-  run
+  if [ ${skip} -ne 1 ]; then
+    build
+    run
+  fi
+  refresh
 }
 
 # Perform the build test for each entry in the test list file