diff --git a/test/run-syntax-checks.sh b/test/run-syntax-checks.sh
index ee27ee17..d6a1f913 100755
--- a/test/run-syntax-checks.sh
+++ b/test/run-syntax-checks.sh
@@ -148,7 +148,6 @@ RunCheck()
 	local msg=$2
 	local no_stl=$3
 	local force_03=$4
-	local build_dir=$5
 	local disable_builtins=$5
 	local build_dir=$6
 
@@ -193,17 +192,23 @@ RunStandard()
 	cxx_standard=$std
 
 	# GCC configurations
-	RunCheck gcc "STL"                   OFF OFF bgcc
-	RunCheck gcc "No STL"                ON  OFF bgcc
+	RunCheck gcc "STL"                   OFF OFF OFF bgcc
+	RunCheck gcc "No STL"                ON  OFF OFF bgcc
+
+	RunCheck gcc "STL - Disable builtins"     OFF ON ON bgcc
+    RunCheck gcc "No STL - Disable builtins"  ON  ON ON bgcc
 
 	if [ "$has_force_03" = "1" ]; then
-		RunCheck gcc "STL - Force C++03"        OFF ON bgcc
-		RunCheck gcc "No STL - Force C++03"     ON  ON bgcc
+		RunCheck gcc "STL - Force C++03"        OFF ON OFF bgcc
+		RunCheck gcc "No STL - Force C++03"     ON  ON OFF bgcc
 	fi
 
 	# Clang configurations
-	RunCheck clang "STL"                   OFF OFF bclang
-	RunCheck clang "No STL"                ON  OFF bclang
+	RunCheck clang "STL"                            OFF OFF OFF bclang
+	RunCheck clang "No STL"                         ON  OFF OFF bclang
+
+    RunCheck clang "STL - Disable builtins"     OFF ON ON bclang
+	RunCheck clang "No STL - Disable builtins"  ON  ON ON bclang
 
 	if [ "$has_force_03" = "1" ]; then
 		RunCheck clang "STL - Force C++03"        OFF ON bclang