diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 870ca0e3952..925adf80205 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2014-09-29  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	PR c++/51385
+	* g++.dg/template/pr51385.C: New.
+
 2014-09-28  Robert Suchanek  <robert.suchanek@imgtec.com>
 
 	* gcc.target/mips/20140928.c: New test.
diff --git a/gcc/testsuite/g++.dg/template/pr51385.C b/gcc/testsuite/g++.dg/template/pr51385.C
new file mode 100644
index 00000000000..e76995467ca
--- /dev/null
+++ b/gcc/testsuite/g++.dg/template/pr51385.C
@@ -0,0 +1,24 @@
+// PR c++/51385
+
+template <__SIZE_TYPE__ N> struct NTmpl;
+template <typename T, typename U, typename V = NTmpl<sizeof(T *)> >
+struct PtrConvs {
+   enum { bad = 1 };
+};
+
+template <typename Target, typename Source>
+struct PtrConvs<Target, Source, NTmpl<sizeof (*(Target **)0 = (Source *)0)> >;
+
+template<typename T> struct test { static const bool value = true; };
+template<> struct test<short> { static const bool value = false; };
+
+template <typename T>
+struct FussyTemplate
+{
+  int sa[test<T>::value ? 1 : -1];
+};
+
+struct B { };
+
+typedef char chk[1];
+typedef char chk[PtrConvs<FussyTemplate<short>, B>::bad];