diff --git a/common/linux/build.sh b/common/linux/build.sh
index 882318f707..756826cc2d 100755
--- a/common/linux/build.sh
+++ b/common/linux/build.sh
@@ -5,11 +5,6 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
 . "${THIS_SCRIPT%/*}/../../resources/build/builder.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-if [[ $BUILDER_OS != linux ]]; then
-  builder_echo grey "Platform is not linux; skipping common/linux"
-  exit 0
-fi
-
 #
 # TODO: when we have linux-specific tests, add them here
 #       as child modules
@@ -23,6 +18,11 @@ builder_describe "Keyman common Linux modules" \
 
 builder_parse "$@"
 
+if [[ $BUILDER_OS != linux ]]; then
+  builder_echo grey "Platform is not linux; skipping common/linux"
+  exit 0
+fi
+
 #-------------------------------------------------------------------------------------------------------------------
 
 builder_run_child_actions clean configure build test
diff --git a/common/mac/build.sh b/common/mac/build.sh
index a1c8532fc8..392966d84c 100755
--- a/common/mac/build.sh
+++ b/common/mac/build.sh
@@ -5,11 +5,6 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
 . "${THIS_SCRIPT%/*}/../../resources/build/builder.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-if [[ $BUILDER_OS != mac ]]; then
-  builder_echo grey "Platform is not macOS; skipping common/mac"
-  exit 0
-fi
-
 #
 # TODO: when we have mac-specific tests, add them here
 #       as child modules
@@ -23,6 +18,11 @@ builder_describe "Keyman common mac modules" \
 
 builder_parse "$@"
 
+if [[ $BUILDER_OS != mac ]]; then
+  builder_echo grey "Platform is not macOS; skipping common/mac"
+  exit 0
+fi
+
 #-------------------------------------------------------------------------------------------------------------------
 
 builder_run_child_actions clean configure build test
diff --git a/common/windows/build.sh b/common/windows/build.sh
index 0245918ec5..714d633544 100755
--- a/common/windows/build.sh
+++ b/common/windows/build.sh
@@ -5,11 +5,6 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
 . "${THIS_SCRIPT%/*}/../../resources/build/builder.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-if [[ $BUILDER_OS != windows ]]; then
-  builder_echo grey "Platform is not Windows; skipping common/windows"
-  exit 0
-fi
-
 #
 # TODO: when we have windows-specific tests, add them here
 #       as child modules
@@ -23,6 +18,11 @@ builder_describe "Keyman common Windows modules" \
 
 builder_parse "$@"
 
+if [[ $BUILDER_OS != windows ]]; then
+  builder_echo grey "Platform is not Windows; skipping common/windows"
+  exit 0
+fi
+
 #-------------------------------------------------------------------------------------------------------------------
 
 builder_run_child_actions clean configure build test