diff -urB busybox/testsuite/testing.sh busybox.new/testsuite/testing.sh
--- busybox/testsuite/testing.sh	2010-07-06 06:25:54.000000000 +0400
+++ busybox.new/testsuite/testing.sh	2010-07-29 12:44:29.000000000 +0400
@@ -26,7 +26,7 @@
 # number of failed tests.
 
 # The "optional" function is used to skip certain tests, ala:
-#   optional CONFIG_FEATURE_THINGY
+#   optional FEATURE_THINGY
 #
 # The "optional" function checks the environment variable "OPTIONFLAGS",
 # which is either empty (in which case it always clears SKIP) or
diff -urB busybox/testsuite/tr.tests busybox.new/testsuite/tr.tests
--- busybox/testsuite/tr.tests	2010-07-06 06:25:54.000000000 +0400
+++ busybox.new/testsuite/tr.tests	2010-07-29 12:43:01.000000000 +0400
@@ -15,19 +15,19 @@
 	"tr -cd '[0-9A-F]'" \
 	"19AF" "" "19AFH\n"
 
-optional CONFIG_FEATURE_TR_CLASSES
+optional FEATURE_TR_CLASSES
 testing "tr understands [:xdigit:]" \
 	"tr -cd '[:xdigit:]'" \
 	"19AF" "" "19AFH\n"
 SKIP=
 
-optional CONFIG_FEATURE_TR_CLASSES
+optional FEATURE_TR_CLASSES
 testing "tr does not stop after [:digit:]" \
 	"tr '[:digit:]y-z' 111111111123" \
 	"111abcx23\n" "" "789abcxyz\n"
 SKIP=
 
-optional CONFIG_FEATURE_TR_CLASSES
+optional FEATURE_TR_CLASSES
 testing "tr has correct xdigit sequence" \
 	"tr '[:xdigit:]Gg' 1111111151242222333330xX" \
 	"#1111111151242222x333330X\n" "" \