diff --git a/tests/Android.mk b/tests/Android.mk
index 9026762c1..ea3a7afd9 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -404,7 +404,9 @@ bionic-unit-tests-run-on-host: bionic-unit-tests $(TARGET_OUT_EXECUTABLES)/$(LIN
 	mkdir -p $(TARGET_OUT_DATA)/local/tmp
 	ln -fs `realpath $(TARGET_OUT_EXECUTABLES)/$(LINKER)` /system/bin
 	ln -fs `realpath $(TARGET_OUT_EXECUTABLES)/sh` /system/bin
+	ln -fs `realpath $(TARGET_OUT)/etc` /system/
 	ANDROID_DATA=$(TARGET_OUT_DATA) \
+	ANDROID_DNS_MODE=local \
 	ANDROID_ROOT=$(TARGET_OUT) \
 	LD_LIBRARY_PATH=$(TARGET_OUT_SHARED_LIBRARIES) \
 		$(TARGET_OUT_DATA_NATIVE_TESTS)/bionic-unit-tests/bionic-unit-tests$(NATIVE_TEST_SUFFIX) $(BIONIC_TEST_FLAGS)
@@ -420,7 +422,9 @@ bionic-unit-tests-run-on-host32: bionic-unit-tests_32 $(TARGET_OUT_EXECUTABLES)/
 	mkdir -p $(TARGET_OUT_DATA)/local/tmp
 	ln -fs `realpath $(TARGET_OUT_EXECUTABLES)/linker` /system/bin
 	ln -fs `realpath $(TARGET_OUT_EXECUTABLES)/sh` /system/bin
+	ln -fs `realpath $(TARGET_OUT)/etc` /system/
 	ANDROID_DATA=$(TARGET_OUT_DATA) \
+	ANDROID_DNS_MODE=local \
 	ANDROID_ROOT=$(TARGET_OUT) \
 	LD_LIBRARY_PATH=$(2ND_TARGET_OUT_SHARED_LIBRARIES) \
 		$(2ND_TARGET_OUT_DATA_NATIVE_TESTS)/bionic-unit-tests/bionic-unit-tests32 $(BIONIC_TEST_FLAGS)