diff --git a/tools/ci/cibuild.sh b/tools/ci/cibuild.sh
index 7adb0d167b9..1aea477655a 100755
--- a/tools/ci/cibuild.sh
+++ b/tools/ci/cibuild.sh
@@ -20,10 +20,10 @@
 # under the License.
 #
 ############################################################################
+
 set -e
 set -o xtrace
 
-
 CID=$(cd "$(dirname "$0")" && pwd)
 CIWORKSPACE=$(cd "${CID}"/../../../ && pwd -P)
 CIPLAT=${CIWORKSPACE}/nuttx/tools/ci/platforms
@@ -144,11 +144,7 @@ function run_builds {
     ncpus=$(grep -c ^processor /proc/cpuinfo)
   fi
 
-  if [ "X$osname" == "Xmsys2" ]; then
-    export MAKEFLAGS="-j"
-  else
-    options+="-j ${ncpus}"
-  fi
+  options+="-j ${ncpus}"
 
   for build in "${builds[@]}"; do
     "${nuttx}"/tools/testbuild.sh ${options} -e "-Wno-cpp -Werror" "${build}"
diff --git a/tools/sethost.sh b/tools/sethost.sh
index 1f319ddd7b6..71fb33938b5 100755
--- a/tools/sethost.sh
+++ b/tools/sethost.sh
@@ -228,4 +228,8 @@ fi
 
 echo "  Refreshing..."
 
+if [ "X$wenv" == "Xmsys" ]; then
+${MAKECMD} olddefconfig || { echo "ERROR: failed to refresh"; exit 1; }
+else
 ${MAKECMD} olddefconfig $* || { echo "ERROR: failed to refresh"; exit 1; }
+fi