diff --git a/tests/build/gets-libcxx/jni/Android.mk b/tests/build/gets-libcxx/jni/Android.mk
index ea2a63a..5386333 100644
--- a/tests/build/gets-libcxx/jni/Android.mk
+++ b/tests/build/gets-libcxx/jni/Android.mk
@@ -3,11 +3,5 @@
 include $(CLEAR_VARS)
 LOCAL_MODULE := gets-libcxx
 LOCAL_SRC_FILES := gets-libcxx.cpp
-LOCAL_CPPFLAGS := -std=c++14
-ifneq ($(NDK_TOOLCHAIN_VERSION),4.9)
-    # GCC has -Wattribute errors with libc++'s math.h because it conflicts with
-    # GCC's builtin definition of abs (math.h defines noexcept floating point
-    # overrides).
-    LOCAL_CFLAGS += -Wall -Werror
-endif
+LOCAL_CPPFLAGS := -std=c++14 -Wall -Werror
 include $(BUILD_EXECUTABLE)
diff --git a/tests/build/issue79115-confusing-ld.gold-warning/jni/Android.mk b/tests/build/issue79115-confusing-ld.gold-warning/jni/Android.mk
index 5e144ea..eaf4706 100644
--- a/tests/build/issue79115-confusing-ld.gold-warning/jni/Android.mk
+++ b/tests/build/issue79115-confusing-ld.gold-warning/jni/Android.mk
@@ -5,10 +5,4 @@
 LOCAL_SRC_FILES := issue79115-confusing-ld.gold-warning.c
 LOCAL_DISABLE_NO_EXECUTE := true
 LOCAL_LDFLAGS += -Wl,--fatal-warnings
-
-ifneq ($(filter clang%,$(NDK_TOOLCHAIN_VERSION)),)
-# Disable integrated assembler because -Wa,--execstack isn't supported
-LOCAL_CFLAGS += -fno-integrated-as
-endif
-
 include $(BUILD_EXECUTABLE)
diff --git a/tests/build/issue81440-non-ascii-comment/build.sh b/tests/build/issue81440-non-ascii-comment/build.sh
index ca466f0..924ece2 100755
--- a/tests/build/issue81440-non-ascii-comment/build.sh
+++ b/tests/build/issue81440-non-ascii-comment/build.sh
@@ -2,7 +2,7 @@
 # See b.android.com/81440
 #
 
-result=$(NDK_TOOLCHAIN_VERSION=clang $NDK/ndk-build -B APP_ABI=armeabi-v7a 2>&1)
+result=$($NDK/ndk-build -B APP_ABI=armeabi-v7a 2>&1)
 echo $result | grep -q "error: expected"
 RET=$?
 rm -rf obj
diff --git a/tests/device/asan-smoke/jni/Application.mk b/tests/device/asan-smoke/jni/Application.mk
index 43da980..3b7baf1 100644
--- a/tests/device/asan-smoke/jni/Application.mk
+++ b/tests/device/asan-smoke/jni/Application.mk
@@ -1,2 +1 @@
 APP_STL := c++_shared
-NDK_TOOLCHAIN_VERSION := clang3.6
diff --git a/tests/device/libcxx-unwind-static/jni/Application.mk b/tests/device/libcxx-unwind-static/jni/Application.mk
index 490f335..9a2e77f 100644
--- a/tests/device/libcxx-unwind-static/jni/Application.mk
+++ b/tests/device/libcxx-unwind-static/jni/Application.mk
@@ -1,3 +1,2 @@
 APP_STL := c++_static
 APP_ABI := armeabi-v7a
-NDK_TOOLCHAIN_VERSION := clang
diff --git a/tests/device/libcxx-unwind/jni/Application.mk b/tests/device/libcxx-unwind/jni/Application.mk
index f633e44..f1792a8 100644
--- a/tests/device/libcxx-unwind/jni/Application.mk
+++ b/tests/device/libcxx-unwind/jni/Application.mk
@@ -1,3 +1,2 @@
 APP_STL := c++_shared
 APP_ABI := armeabi-v7a
-NDK_TOOLCHAIN_VERSION := clang
diff --git a/tests/device/test-cpufeatures/jni/Android.mk b/tests/device/test-cpufeatures/jni/Android.mk
index 858423c..8b20bd0 100644
--- a/tests/device/test-cpufeatures/jni/Android.mk
+++ b/tests/device/test-cpufeatures/jni/Android.mk
@@ -26,14 +26,8 @@
 include $(BUILD_EXECUTABLE)
 endif
 
-# Disable the following tests for GCC4.6/binutils-2.21 as well because
-# platform libs are now built with the new default GCC4.8/binutils-2.24, and crt*.o
-# generated by it can't be used by GCC4.6/binutils-2.21 due to inconsistency in
-# usage of Tag involves DIV
-#
 ifeq ($(TARGET_ARCH),arm)
 ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
-ifneq ($(NDK_TOOLCHAIN_VERSION),4.6)
 include $(CLEAR_VARS)
 LOCAL_MODULE := test_arm_idiv_support
 LOCAL_SRC_FILES := test_arm_idiv.c
@@ -55,6 +49,5 @@
 include $(BUILD_EXECUTABLE)
 endif
 endif
-endif
 
 $(call import-module,android/cpufeatures)