diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 3ba2518d8f2821e60aafaef62278da6a9fc9e820..d57410cb92b640bc947692d310070ad60b9c2360 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2019-08-02  Marek Polacek  <polacek@redhat.com>
+
+	PR c++/53009
+	* g++.dg/cpp0x/nontype3.C: New test.
+
 2019-08-02  Marek Polacek  <polacek@redhat.com>
 
 	PR c++/77575
diff --git a/gcc/testsuite/g++.dg/cpp0x/nontype3.C b/gcc/testsuite/g++.dg/cpp0x/nontype3.C
new file mode 100644
index 0000000000000000000000000000000000000000..02b5f60c3fc8d6c36d9e7facb216d9a41585b8db
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/nontype3.C
@@ -0,0 +1,32 @@
+// PR c++/53009
+// { dg-do compile { target c++11 } }
+
+template<typename T, T> class function_proxy;
+
+template<typename Return, typename Obj, Return(*func)(Obj)>
+struct function_proxy<Return(*)(Obj), func>
+{
+    static void wrapper(){ }
+};
+
+template<typename CT, CT> class member_helper;
+
+template<typename Class, void(Class::*fun)()>
+struct member_helper<void(Class::*)(), fun>
+{
+    static void as_free(Class& obj){ }
+
+    static void worker(){
+        (void) function_proxy<decltype(&as_free), &as_free>::wrapper;
+    }
+};
+
+struct Test
+{
+    void test(){ }
+};
+
+int main()
+{
+    member_helper<decltype(&Test::test), &Test::test>::worker();
+}