diff --git a/tests/Android.mk b/tests/Android.mk
index ab4409ffe..278511b05 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -244,8 +244,8 @@ bionic-unit-tests_src_files := \
     dlext_test.cpp \
     dlfcn_test.cpp \
 
-bionic-unit-tests_cppflags := \
-    $(test_cppflags)
+bionic-unit-tests_cflags := $(test_cflags)
+bionic-unit-tests_cppflags := $(test_cppflags)
 
 bionic-unit-tests_ldflags := \
     -Wl,--export-dynamic \
@@ -301,8 +301,8 @@ bionic-unit-tests-glibc_whole_static_libraries := \
 bionic-unit-tests-glibc_ldlibs := \
     -lrt -ldl \
 
-bionic-unit-tests-glibc_cppflags := \
-    $(test_cppflags)
+bionic-unit-tests-glibc_cflags := $(test_cflags)
+bionic-unit-tests-glibc_cppflags := $(test_cppflags)
 
 module := bionic-unit-tests-glibc
 module_tag := optional
diff --git a/tests/dlfcn_test.cpp b/tests/dlfcn_test.cpp
index 18963cf3f..8b3f11c41 100644
--- a/tests/dlfcn_test.cpp
+++ b/tests/dlfcn_test.cpp
@@ -61,7 +61,7 @@ TEST(dlfcn, dlsym_local_symbol) {
   uint32_t (*f)(void);
   f = reinterpret_cast<uint32_t (*)(void)>(dlsym(handle, "dlsym_local_symbol_get_taxicab_number_using_dlsym"));
   ASSERT_TRUE(f != NULL);
-  ASSERT_EQ(1729, f());
+  ASSERT_EQ(1729U, f());
 }
 
 TEST(dlfcn, dlopen_noload) {