diff --git a/gcc/testsuite/g++.dg/ext/visibility/anon8.C b/gcc/testsuite/g++.dg/ext/visibility/anon8.C
index bfcc2d06df66eac4a006f930fa1c91a6112a938c..2c3a8acac93c31c9fcd34d2dc2abd7f4476db711 100644
--- a/gcc/testsuite/g++.dg/ext/visibility/anon8.C
+++ b/gcc/testsuite/g++.dg/ext/visibility/anon8.C
@@ -26,7 +26,7 @@ int main ()
     static void fn2 () {}
   };
   call<&B1::fn1> ();
-  call<&B2::fn2> ();	// { dg-error "linkage|no matching" "" { target c++14_down } }
+  call<&B2::fn2> ();	// { dg-error "linkage|no matching" "PR83258" { target c++14_down } }
   call<&fn3> ();
   call<&B1::fn4> ();
   call<&fn5> ();	// { dg-error "linkage|no matching" "" { target { ! c++11 } } }
diff --git a/gcc/testsuite/g++.dg/template/function2.C b/gcc/testsuite/g++.dg/template/function2.C
deleted file mode 100644
index 54c48e6b36f49b3f88e0c7fc45923557bf4cab16..0000000000000000000000000000000000000000
--- a/gcc/testsuite/g++.dg/template/function2.C
+++ /dev/null
@@ -1,8 +0,0 @@
-// PR c++/83258
-
-template<void(*)()> struct A { };
-
-int main() {
-  struct B { static void f() { } };
-  A<B::f> a; // { dg-error "linkage" "" { target c++14_down } }
-}