diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 3841aaf3b95..f3354bc5c67 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2016-09-29  Marek Polacek  <polacek@redhat.com>
+
+	* g++.dg/cpp0x/fallthrough2.C: Only expect the warning in C++11 and
+	C++14.
+
 2016-09-29  Martin Liska  <mliska@suse.cz>
 
 	* objc/execute/construct1.m: New test.
diff --git a/gcc/testsuite/g++.dg/cpp0x/fallthrough2.C b/gcc/testsuite/g++.dg/cpp0x/fallthrough2.C
index b6964e151d5..71c4a4fad8f 100644
--- a/gcc/testsuite/g++.dg/cpp0x/fallthrough2.C
+++ b/gcc/testsuite/g++.dg/cpp0x/fallthrough2.C
@@ -11,7 +11,7 @@ f (int i)
     {
     case 1:
       bar (1);
-      [[fallthrough]]; // { dg-warning ".fallthrough. is a C\\+\\+17 feature" }
+      [[fallthrough]]; // { dg-warning ".fallthrough. is a C\\+\\+17 feature" "" { target { ! c++1z } }  }
     case 3:
       bar (1);
       [[gnu::fallthrough, gnu::fallthrough]]; // { dg-warning ".fallthrough. attribute specified multiple times" }