diff --git a/tools/testbuild.sh b/tools/testbuild.sh
index 65ab2aed19..e4cfbe8861 100755
--- a/tools/testbuild.sh
+++ b/tools/testbuild.sh
@@ -195,7 +195,7 @@ fi
 cd $nuttx || { echo "ERROR: failed to CD to $nuttx"; exit 1; }
 
 function exportandimport {
-  # Do nothing until we finish to build the nuttx
+  # Do nothing until we finish to build the nuttx.
   if [ ! -f nuttx ]; then
     return $fail
   fi
@@ -387,6 +387,14 @@ function build_cmake {
     fail=1
   fi
 
+  if [ ${SAVEARTIFACTS} -eq 1 ]; then
+    artifactconfigdir=$ARTIFACTDIR/$(echo $config | sed "s/:/\//")/
+    mkdir -p $artifactconfigdir
+    cd $nuttx/build
+    xargs -I "{}" cp "{}" $artifactconfigdir < $nuttx/build/nuttx.manifest
+    cd $nuttx
+  fi
+
   return $fail
 }