diff --git a/core/target_test_internal.mk b/core/target_test_internal.mk
index ed011d11b4..f8a9f049fa 100644
--- a/core/target_test_internal.mk
+++ b/core/target_test_internal.mk
@@ -6,25 +6,10 @@ LOCAL_CFLAGS += -DGTEST_OS_LINUX_ANDROID -DGTEST_HAS_STD_STRING
 
 LOCAL_C_INCLUDES += external/gtest/include
 
-my_test_libcxx := true
-ifdef LOCAL_SDK_VERSION
-my_test_libcxx := false
-endif
-ifneq ($(filter $(strip $(LOCAL_CXX_STL)),stlport stlport_static),)
-my_test_libcxx := false
-endif
-
-ifeq ($(my_test_libcxx),true)
-LOCAL_STATIC_LIBRARIES += libgtest_libc++ libgtest_main_libc++
-else
-LOCAL_STATIC_LIBRARIES += libgtest libgtest_main
-
 ifndef LOCAL_SDK_VERSION
-LOCAL_C_INCLUDES += bionic \
-                    bionic/libstdc++/include \
-                    external/stlport/stlport
-LOCAL_SHARED_LIBRARIES += libstlport libstdc++
-endif
+LOCAL_STATIC_LIBRARIES += libgtest libgtest_main
+else
+LOCAL_STATIC_LIBRARIES += libgtest_ndk libgtest_main_ndk
 endif
 
 ifdef LOCAL_MODULE_PATH