diff --git a/libstdc++-v3/testsuite/24_iterators/range_generators/01.cc b/libstdc++-v3/testsuite/24_iterators/range_generators/01.cc
index 2af5ed1895a..81837e156fe 100644
--- a/libstdc++-v3/testsuite/24_iterators/range_generators/01.cc
+++ b/libstdc++-v3/testsuite/24_iterators/range_generators/01.cc
@@ -12,13 +12,8 @@
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING3. If not see
// .
#include
diff --git a/libstdc++-v3/testsuite/24_iterators/range_generators/02.cc b/libstdc++-v3/testsuite/24_iterators/range_generators/02.cc
index 8e23a9c4933..da2d2d42f04 100644
--- a/libstdc++-v3/testsuite/24_iterators/range_generators/02.cc
+++ b/libstdc++-v3/testsuite/24_iterators/range_generators/02.cc
@@ -12,13 +12,8 @@
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING3. If not see
// .
#include
diff --git a/libstdc++-v3/testsuite/24_iterators/range_generators/copy.cc b/libstdc++-v3/testsuite/24_iterators/range_generators/copy.cc
index c74fb0cf09e..7ceec33dd78 100644
--- a/libstdc++-v3/testsuite/24_iterators/range_generators/copy.cc
+++ b/libstdc++-v3/testsuite/24_iterators/range_generators/copy.cc
@@ -12,13 +12,8 @@
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING3. If not see
// .
#include
diff --git a/libstdc++-v3/testsuite/24_iterators/range_generators/except.cc b/libstdc++-v3/testsuite/24_iterators/range_generators/except.cc
index 82f6e4e45f6..87d8cebb185 100644
--- a/libstdc++-v3/testsuite/24_iterators/range_generators/except.cc
+++ b/libstdc++-v3/testsuite/24_iterators/range_generators/except.cc
@@ -12,13 +12,8 @@
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING3. If not see
// .
#include
diff --git a/libstdc++-v3/testsuite/24_iterators/range_generators/iter_deref_return.cc b/libstdc++-v3/testsuite/24_iterators/range_generators/iter_deref_return.cc
index 75471952e76..a39f769b29e 100644
--- a/libstdc++-v3/testsuite/24_iterators/range_generators/iter_deref_return.cc
+++ b/libstdc++-v3/testsuite/24_iterators/range_generators/iter_deref_return.cc
@@ -12,6 +12,10 @@
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING3. If not see
+// .
+
#include
// Check that the return type of iterator::operator* is the reference type.
diff --git a/libstdc++-v3/testsuite/24_iterators/range_generators/subrange.cc b/libstdc++-v3/testsuite/24_iterators/range_generators/subrange.cc
index 93d7126cafe..106d604cd47 100644
--- a/libstdc++-v3/testsuite/24_iterators/range_generators/subrange.cc
+++ b/libstdc++-v3/testsuite/24_iterators/range_generators/subrange.cc
@@ -12,13 +12,8 @@
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING3. If not see
// .
#include
diff --git a/libstdc++-v3/testsuite/24_iterators/range_generators/synopsis.cc b/libstdc++-v3/testsuite/24_iterators/range_generators/synopsis.cc
index d031f1d0c94..7eb77b4bb72 100644
--- a/libstdc++-v3/testsuite/24_iterators/range_generators/synopsis.cc
+++ b/libstdc++-v3/testsuite/24_iterators/range_generators/synopsis.cc
@@ -13,13 +13,8 @@
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING3. If not see
// .
#include