diff --git a/package/base/gcc/parse-config b/package/base/gcc/parse-config
index eb7e12cb6..fecbca5f3 100644
--- a/package/base/gcc/parse-config
+++ b/package/base/gcc/parse-config
@@ -101,7 +101,17 @@ case "$ROCKCFG_OPT" in
         	var_insert GCC_WRAPPER_INSERT " " "-Os -pipe"
 		;;
 	lazy)
-        	var_insert GCC_WRAPPER_INSERT " " "-O -pipe"
+        	var_insert GCC_WRAPPER_INSERT " " "-O1 -pipe"
+		;;
+	test)
+		case "$pkg" in
+			gcc*|glibc*|binutils*|make|bzip2|gzip|coreutils|bash*|gawk|sed)
+				var_insert GCC_WRAPPER_INSERT " " "-Os -pipe"
+				;;
+			*)
+				var_insert GCC_WRAPPER_INSERT " " "-O1 -pipe"
+				;;
+		esac
 		;;
 esac
 
diff --git a/scripts/config.in b/scripts/config.in
index 5d8d99e72..c6109df0e 100644
--- a/scripts/config.in
+++ b/scripts/config.in
@@ -363,7 +363,8 @@ break packages!'
 		bizarre	'Inverse smart optimisation (this is bizarre)'	\
 		speed	'Hard optimise for speed (often pretty slow)'	\
 		size	'Hard optimise for size (recommended)'		\
-		lazy	'Lazy optimisiation (for debugging binaries)'
+		lazy	'Lazy optimisiation (for debugging binaries)'	\
+		test	'Only optimize toolchain (for fast builds)'
 
 	bool 'Create binaries with debug symbols' ROCKCFG_DEBUG 0
 	bool 'Create statically linked binaries' ROCKCFG_STATIC 0
diff --git a/target/reference/config.in b/target/reference/config.in
index d56663e8b..e200d991c 100644
--- a/target/reference/config.in
+++ b/target/reference/config.in
@@ -24,3 +24,5 @@ block_begin 0
 	comment '-- WARNING: This target is for internal use only!'
 block_end
 
+ROCKCFGSET_OPT='test'
+