diff --git a/tests/Android.mk b/tests/Android.mk
index 9a17c10..699c93d 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -107,6 +107,9 @@
     unistd_test.cpp \
     wchar_test.cpp \
 
+libBionicStandardTests_c_includes := \
+    bionic/libc/private \
+
 libBionicStandardTests_cflags := \
     $(test_cflags) \
 
@@ -319,10 +322,9 @@
     libBionicTests \
 
 bionic-unit-tests-static_static_libraries := \
-    libstlport_static \
     libm \
     libc \
-    libstdc++ \
+    libc++ \
 
 bionic-unit-tests-static_force_static_executable := true