diff --git a/boards/arm/imx6/sabre-6quad/configs/citest/run b/boards/arm/imx6/sabre-6quad/configs/citest/run.sh
similarity index 100%
rename from boards/arm/imx6/sabre-6quad/configs/citest/run
rename to boards/arm/imx6/sabre-6quad/configs/citest/run.sh
diff --git a/boards/risc-v/qemu-rv/rv-virt/configs/citest/run b/boards/risc-v/qemu-rv/rv-virt/configs/citest/run.sh
similarity index 100%
rename from boards/risc-v/qemu-rv/rv-virt/configs/citest/run
rename to boards/risc-v/qemu-rv/rv-virt/configs/citest/run.sh
diff --git a/boards/risc-v/qemu-rv/rv-virt/configs/citest64/run b/boards/risc-v/qemu-rv/rv-virt/configs/citest64/run.sh
similarity index 100%
rename from boards/risc-v/qemu-rv/rv-virt/configs/citest64/run
rename to boards/risc-v/qemu-rv/rv-virt/configs/citest64/run.sh
diff --git a/boards/sim/sim/sim/configs/citest/run b/boards/sim/sim/sim/configs/citest/run.sh
similarity index 100%
rename from boards/sim/sim/sim/configs/citest/run
rename to boards/sim/sim/sim/configs/citest/run.sh
diff --git a/tools/testbuild.sh b/tools/testbuild.sh
index 417ca7a122f..0bafcc8981a 100755
--- a/tools/testbuild.sh
+++ b/tools/testbuild.sh
@@ -492,7 +492,7 @@ function refresh {
 
 function run {
   if [ ${RUN} -ne 0 ] && [ -z ${cmake} ]; then
-    run_script="$path/run"
+    run_script="$path/run.sh"
     if [ -x $run_script ]; then
       echo "  Running NuttX..."
       export ARTIFACTCONFDIR=$ARTIFACTDIR/$(echo $config | sed "s/:/\//")/