diff --git a/gcc/testsuite/g++.dg/cpp0x/noexcept03.C b/gcc/testsuite/g++.dg/cpp0x/noexcept03.C
index 906a44da4577..b25e7327947c 100644
--- a/gcc/testsuite/g++.dg/cpp0x/noexcept03.C
+++ b/gcc/testsuite/g++.dg/cpp0x/noexcept03.C
@@ -35,7 +35,7 @@ void f2(T a) noexcept (noexcept (f (a)))
   f(a);
 }
 
-struct A { A() { } };		// { dg-warning "does not throw" }
+struct A { A() { } };		// { dg-message "does not throw" }
 
 int main()
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/noexcept09.C b/gcc/testsuite/g++.dg/cpp0x/noexcept09.C
index d26a3aeab100..bda7269d927e 100644
--- a/gcc/testsuite/g++.dg/cpp0x/noexcept09.C
+++ b/gcc/testsuite/g++.dg/cpp0x/noexcept09.C
@@ -3,7 +3,7 @@
 // { dg-options "-Wnoexcept" }
 
 template <class T>
-T f (T t) { return t; }		// { dg-warning "does not throw" }
+T f (T t) { return t; }		// { dg-message "does not throw" }
 
 #define SA(X) static_assert(X, #X)
 
diff --git a/gcc/testsuite/g++.dg/warn/Wnoexcept1.C b/gcc/testsuite/g++.dg/warn/Wnoexcept1.C
index e3a5df64459b..93210dead041 100644
--- a/gcc/testsuite/g++.dg/warn/Wnoexcept1.C
+++ b/gcc/testsuite/g++.dg/warn/Wnoexcept1.C
@@ -7,7 +7,7 @@
 // We expect a warning at the declaration of construct2, since Automatic2 is
 // defined below; we don't expect one for construct1, because Automatic1 is
 // defined in the fake system header.
-// { dg-warning "noexcept-expression" "" { target *-*-* } 26 }
+// { dg-warning "noexcept-expression" "" { target *-*-* } 15 }
 
 class Automatic2 {
 public:
@@ -15,7 +15,6 @@ public:
 
 private:
   size_t Bla;
-  NotNoexcept Dummy;
 };
 
 union U
diff --git a/gcc/testsuite/g++.dg/warn/Wnoexcept1.h b/gcc/testsuite/g++.dg/warn/Wnoexcept1.h
index f59733e705fe..8843ab4237ba 100644
--- a/gcc/testsuite/g++.dg/warn/Wnoexcept1.h
+++ b/gcc/testsuite/g++.dg/warn/Wnoexcept1.h
@@ -4,17 +4,6 @@
 using size_t = decltype(sizeof(42));
 inline void * operator new (size_t, void *p) noexcept { return p; }
 
-class NotNoexcept {
-public:
-  NotNoexcept() noexcept(false) {}
-  NotNoexcept(const NotNoexcept&) noexcept(false) {}
-  NotNoexcept(NotNoexcept &&) noexcept(false) {}
-  ~NotNoexcept() noexcept(false) {}
-
-  NotNoexcept&operator=(const NotNoexcept&) noexcept(false) { return *this;}
-  NotNoexcept&operator=(NotNoexcept &&) noexcept(false) {return *this;}
-};
-
 template<typename _Up, typename... _Args>
 void
 construct1(_Up* __p, _Args... __args)
@@ -33,5 +22,4 @@ public:
 
 private:
   size_t Bla;
-  NotNoexcept Dummy;
 };