diff --git a/tests/keymaster/Android.mk b/tests/keymaster/Android.mk
index cd767546..2661211b 100644
--- a/tests/keymaster/Android.mk
+++ b/tests/keymaster/Android.mk
@@ -9,7 +9,6 @@ LOCAL_SRC_FILES:= \
 # Note that "bionic" is needed because of stlport
 LOCAL_C_INCLUDES := \
     bionic \
-    libcore/include \
     external/gtest/include \
     external/stlport/stlport
 
diff --git a/tests/keymaster/keymaster_test.cpp b/tests/keymaster/keymaster_test.cpp
index 383aeb58..98e94076 100644
--- a/tests/keymaster/keymaster_test.cpp
+++ b/tests/keymaster/keymaster_test.cpp
@@ -16,6 +16,7 @@
 
 #define LOG_TAG "keymaster_test"
 #include <utils/Log.h>
+#include <utils/UniquePtr.h>
 
 #include <hardware/keymaster.h>
 
@@ -23,7 +24,6 @@
 
 #include <fstream>
 #include <iostream>
-#include <UniquePtr.h>
 
 namespace android {