diff --git a/tests/build/issue52805-set_new_handler/jni/Android.mk b/tests/build/issue52805-set_new_handler/jni/Android.mk
new file mode 100644
index 0000000..20930f6
--- /dev/null
+++ b/tests/build/issue52805-set_new_handler/jni/Android.mk
@@ -0,0 +1,5 @@
+LOCAL_PATH := $(call my-dir)
+include $(CLEAR_VARS)
+LOCAL_MODULE    := new_handler
+LOCAL_SRC_FILES := new_handler.cpp
+include $(BUILD_SHARED_LIBRARY)
diff --git a/tests/build/issue52805-set_new_handler/jni/Application.mk b/tests/build/issue52805-set_new_handler/jni/Application.mk
new file mode 100644
index 0000000..b93171a
--- /dev/null
+++ b/tests/build/issue52805-set_new_handler/jni/Application.mk
@@ -0,0 +1,2 @@
+APP_ABI := all
+APP_STL := stlport_shared
\ No newline at end of file
diff --git a/tests/build/issue52805-set_new_handler/jni/new_handler.cpp b/tests/build/issue52805-set_new_handler/jni/new_handler.cpp
new file mode 100644
index 0000000..e92b591
--- /dev/null
+++ b/tests/build/issue52805-set_new_handler/jni/new_handler.cpp
@@ -0,0 +1,5 @@
+#include <new>
+std::new_handler get_and_reset_new_handler()
+{
+    return std::set_new_handler(0);
+}