diff --git a/coreutils/Config.in b/coreutils/Config.in
index 29b55d4ec..80aca3050 100644
--- a/coreutils/Config.in
+++ b/coreutils/Config.in
@@ -189,7 +189,7 @@ config ECHO
 config FEATURE_FANCY_ECHO
 	bool "Enable echo options (-n and -e)"
 	default y
-	depends on ECHO
+	depends on ECHO || ASH_BUILTIN_ECHO
 	help
 	  This adds options (-n and -e) to echo.
 
@@ -649,7 +649,7 @@ config TEST
 config FEATURE_TEST_64
 	bool "Extend test to 64 bit"
 	default n
-	depends on TEST
+	depends on TEST || FEATURE_TEST_64
 	help
 	  Enable 64-bit support in test.
 
diff --git a/testsuite/awk.tests b/testsuite/awk.tests
index 4eabd7595..b3c076e4b 100755
--- a/testsuite/awk.tests
+++ b/testsuite/awk.tests
@@ -16,6 +16,11 @@ testing "awk -F case 5" "awk -F '[#]' '{ print NF }'" "4\n" "" "#abc##zz\n"
 testing "awk -F case 6" "awk -F '[#]' '{ print NF }'" "4\n" "" "z#abc##zz\n"
 testing "awk -F case 7" "awk -F '[#]' '{ print NF }'" "5\n" "" "z##abc##zz\n"
 
+# 4294967295 = 0xffffffff
+testing "awk bitwise op"  "awk '{ print or(4294967295,1) }'" "4.29497e+09\n" "" "\n"
+testing "awk hex const 1" "awk '{ print or(0xffffffff,1) }'" "4.29497e+09\n" "" "\n"
+testing "awk hex const 2" "awk '{ print or(0x80000000,1) }'" "2.14748e+09\n" "" "\n"
+
 tar xjf awk_t1.tar.bz2
 testing "awk 'gcc build bug'" \
 	"awk -f awk_t1_opt-functions.awk -f awk_t1_opth-gen.awk <awk_t1_input | md5sum" \