diff --git a/libstdc++-v3/testsuite/20_util/memory_resource/1.cc b/libstdc++-v3/testsuite/20_util/memory_resource/1.cc
index cc96a3e546d00d173dfe6d26090b12e00e419b78..174949da27babe8890dc3ee173c29cf679c74471 100644
--- a/libstdc++-v3/testsuite/20_util/memory_resource/1.cc
+++ b/libstdc++-v3/testsuite/20_util/memory_resource/1.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++17" }
 // { dg-do compile { target c++17 } }
 
 // Copyright (C) 2018-2021 Free Software Foundation, Inc.
diff --git a/libstdc++-v3/testsuite/20_util/memory_resource/2.cc b/libstdc++-v3/testsuite/20_util/memory_resource/2.cc
index 725a216d3808b4cfa04df0c4a6efb6dc8afa36c3..0c88e0b8b7e1a849944ec3cb054ed940a8c5bfc1 100644
--- a/libstdc++-v3/testsuite/20_util/memory_resource/2.cc
+++ b/libstdc++-v3/testsuite/20_util/memory_resource/2.cc
@@ -1,4 +1,3 @@
-// { dg-options "-std=gnu++17" }
 // { dg-do run { target c++17 } }
 // { dg-skip-if "" { *-*-* } { -fno-aligned-new } }
 
diff --git a/libstdc++-v3/testsuite/20_util/monotonic_buffer_resource/1.cc b/libstdc++-v3/testsuite/20_util/monotonic_buffer_resource/1.cc
index 9cd243c4c2f87e018927f035902fa9f6568586da..eb7e20483e50deca35ca8523f82bad9e3d1d1fd5 100644
--- a/libstdc++-v3/testsuite/20_util/monotonic_buffer_resource/1.cc
+++ b/libstdc++-v3/testsuite/20_util/monotonic_buffer_resource/1.cc
@@ -15,7 +15,6 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-options "-std=gnu++17" }
 // { dg-do compile { target c++17 } }
 
 #include <memory_resource>
diff --git a/libstdc++-v3/testsuite/20_util/monotonic_buffer_resource/93208.cc b/libstdc++-v3/testsuite/20_util/monotonic_buffer_resource/93208.cc
index 3e3d3404df787981331f0134fcbd4cfc8aa7064e..89f1d00540bbb759a418fca96f570d78c80a4e76 100644
--- a/libstdc++-v3/testsuite/20_util/monotonic_buffer_resource/93208.cc
+++ b/libstdc++-v3/testsuite/20_util/monotonic_buffer_resource/93208.cc
@@ -15,7 +15,6 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-options "-std=gnu++17" }
 // { dg-do compile { target c++17 } }
 // { dg-final { scan-assembler-not "_ZT\[IS\]NSt3pmr15memory_resourceE" } }
 // { dg-final { scan-assembler-not "_ZT\[IS\]NSt3pmr25monotonic\[a-z_\]*E" } }
diff --git a/libstdc++-v3/testsuite/20_util/monotonic_buffer_resource/allocate.cc b/libstdc++-v3/testsuite/20_util/monotonic_buffer_resource/allocate.cc
index 95d512d4b825c3cbcc412edef97d26e40c64cf1b..40180223bae34a53b293b55fdfc147a31d2beb18 100644
--- a/libstdc++-v3/testsuite/20_util/monotonic_buffer_resource/allocate.cc
+++ b/libstdc++-v3/testsuite/20_util/monotonic_buffer_resource/allocate.cc
@@ -15,7 +15,6 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-options "-std=gnu++17" }
 // { dg-do run { target c++17 } }
 // { dg-require-cstdint "" }
 
diff --git a/libstdc++-v3/testsuite/20_util/monotonic_buffer_resource/deallocate.cc b/libstdc++-v3/testsuite/20_util/monotonic_buffer_resource/deallocate.cc
index 73acdbaa754632ef6be3a712c0ae68b5fd470c05..3fcaf2b4c98355462551957347a532924d2d8b0a 100644
--- a/libstdc++-v3/testsuite/20_util/monotonic_buffer_resource/deallocate.cc
+++ b/libstdc++-v3/testsuite/20_util/monotonic_buffer_resource/deallocate.cc
@@ -15,7 +15,6 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-options "-std=gnu++17" }
 // { dg-do run { target c++17 } }
 // { dg-require-cstdint "" }
 
diff --git a/libstdc++-v3/testsuite/20_util/monotonic_buffer_resource/release.cc b/libstdc++-v3/testsuite/20_util/monotonic_buffer_resource/release.cc
index 0e12632debc1b2b4745946c3be71605592edc891..5f1599434997c174aca32a839949a595d3c57726 100644
--- a/libstdc++-v3/testsuite/20_util/monotonic_buffer_resource/release.cc
+++ b/libstdc++-v3/testsuite/20_util/monotonic_buffer_resource/release.cc
@@ -15,7 +15,6 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-options "-std=gnu++17" }
 // { dg-do run { target c++17 } }
 
 #include <memory_resource>
diff --git a/libstdc++-v3/testsuite/20_util/monotonic_buffer_resource/upstream_resource.cc b/libstdc++-v3/testsuite/20_util/monotonic_buffer_resource/upstream_resource.cc
index 641a0d21cf6e006bbdb088ea7c60a528ab4bb9af..51f6d07d01770e593e4a0e67abed51b580082124 100644
--- a/libstdc++-v3/testsuite/20_util/monotonic_buffer_resource/upstream_resource.cc
+++ b/libstdc++-v3/testsuite/20_util/monotonic_buffer_resource/upstream_resource.cc
@@ -15,7 +15,6 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-options "-std=gnu++17" }
 // { dg-do run { target c++17 } }
 
 #include <memory_resource>
diff --git a/libstdc++-v3/testsuite/20_util/polymorphic_allocator/1.cc b/libstdc++-v3/testsuite/20_util/polymorphic_allocator/1.cc
index 5ac106488d24e66e3f8f1ef7721783e18fd3f9ab..12a4322fdc4b1c63c141dcee7ea2219735e528ea 100644
--- a/libstdc++-v3/testsuite/20_util/polymorphic_allocator/1.cc
+++ b/libstdc++-v3/testsuite/20_util/polymorphic_allocator/1.cc
@@ -15,7 +15,6 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-options "-std=gnu++17" }
 // { dg-do compile { target c++17 } }
 
 #include <memory_resource>
diff --git a/libstdc++-v3/testsuite/20_util/polymorphic_allocator/construct_pair.cc b/libstdc++-v3/testsuite/20_util/polymorphic_allocator/construct_pair.cc
index ee2737a60e7d3427ff5fe14e29e941ad9dba4d6c..c7dedd0d3b10e51d4505fbf1ba6ed59620ce2b1e 100644
--- a/libstdc++-v3/testsuite/20_util/polymorphic_allocator/construct_pair.cc
+++ b/libstdc++-v3/testsuite/20_util/polymorphic_allocator/construct_pair.cc
@@ -15,7 +15,6 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-options "-std=gnu++17" }
 // { dg-do run { target c++17 } }
 
 #include <memory_resource>
diff --git a/libstdc++-v3/testsuite/20_util/polymorphic_allocator/resource.cc b/libstdc++-v3/testsuite/20_util/polymorphic_allocator/resource.cc
index 01bafabbc14429c8bf9801282ee74f7320232917..ad0821611f389d9822768893a4563b81d55caa4c 100644
--- a/libstdc++-v3/testsuite/20_util/polymorphic_allocator/resource.cc
+++ b/libstdc++-v3/testsuite/20_util/polymorphic_allocator/resource.cc
@@ -15,7 +15,6 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-options "-std=gnu++17" }
 // { dg-do run { target c++17 } }
 // { dg-skip-if "" { *-*-* } { -fno-aligned-new } }
 
diff --git a/libstdc++-v3/testsuite/20_util/polymorphic_allocator/select.cc b/libstdc++-v3/testsuite/20_util/polymorphic_allocator/select.cc
index 71a7097576deae97ca7d2294b63774ec44b98476..f53462969f5d4ffaa0c334d40f209e7bf413fb0a 100644
--- a/libstdc++-v3/testsuite/20_util/polymorphic_allocator/select.cc
+++ b/libstdc++-v3/testsuite/20_util/polymorphic_allocator/select.cc
@@ -15,7 +15,6 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-options "-std=gnu++17" }
 // { dg-do run { target c++17 } }
 // { dg-skip-if "" { *-*-* } { -fno-aligned-new } }
 
diff --git a/libstdc++-v3/testsuite/20_util/synchronized_pool_resource/allocate.cc b/libstdc++-v3/testsuite/20_util/synchronized_pool_resource/allocate.cc
index f7af9b695ef4635409e80a4dad37cc45ccdd382a..51445d65f7104dabb9c01ca9e27ed76153149ae7 100644
--- a/libstdc++-v3/testsuite/20_util/synchronized_pool_resource/allocate.cc
+++ b/libstdc++-v3/testsuite/20_util/synchronized_pool_resource/allocate.cc
@@ -16,7 +16,7 @@
 // <http://www.gnu.org/licenses/>.
 
 // { dg-do run }
-// { dg-options "-std=gnu++17 -pthread" }
+// { dg-options "-pthread" }
 // { dg-require-effective-target c++17 }
 // { dg-require-effective-target pthread }
 // { dg-require-gthreads "" }
diff --git a/libstdc++-v3/testsuite/20_util/synchronized_pool_resource/allocate_single.cc b/libstdc++-v3/testsuite/20_util/synchronized_pool_resource/allocate_single.cc
index df9c317456b5068e22d8e76edb9421456aa1f5ec..1d03a60f3ebec0d7e4607cd20695df7c560cea95 100644
--- a/libstdc++-v3/testsuite/20_util/synchronized_pool_resource/allocate_single.cc
+++ b/libstdc++-v3/testsuite/20_util/synchronized_pool_resource/allocate_single.cc
@@ -16,7 +16,6 @@
 // <http://www.gnu.org/licenses/>.
 
 // { dg-do run }
-// { dg-options "-std=gnu++17" }
 // { dg-require-effective-target c++17 }
 // { dg-require-gthreads "" }
 
diff --git a/libstdc++-v3/testsuite/20_util/synchronized_pool_resource/cons.cc b/libstdc++-v3/testsuite/20_util/synchronized_pool_resource/cons.cc
index 065a6e91550de3d6af1c906d3e6e1c948e333972..0d42bfeea89ad8453322e71a51d09265984ad8cb 100644
--- a/libstdc++-v3/testsuite/20_util/synchronized_pool_resource/cons.cc
+++ b/libstdc++-v3/testsuite/20_util/synchronized_pool_resource/cons.cc
@@ -16,7 +16,7 @@
 // <http://www.gnu.org/licenses/>.
 
 // { dg-do run }
-// { dg-options "-std=gnu++17 -pthread" }
+// { dg-options "-pthread" }
 // { dg-require-effective-target c++17 }
 // { dg-require-effective-target pthread }
 // { dg-require-gthreads "" }
diff --git a/libstdc++-v3/testsuite/20_util/synchronized_pool_resource/cons_single.cc b/libstdc++-v3/testsuite/20_util/synchronized_pool_resource/cons_single.cc
index 3b370745f20914bfc592ac70982e2ef255f6dd1d..d02bb86b88aa55e2b8927d06a2133b8eacc90d6b 100644
--- a/libstdc++-v3/testsuite/20_util/synchronized_pool_resource/cons_single.cc
+++ b/libstdc++-v3/testsuite/20_util/synchronized_pool_resource/cons_single.cc
@@ -16,7 +16,6 @@
 // <http://www.gnu.org/licenses/>.
 
 // { dg-do run }
-// { dg-options "-std=gnu++17" }
 // { dg-require-effective-target c++17 }
 // { dg-require-gthreads "" }
 
diff --git a/libstdc++-v3/testsuite/20_util/synchronized_pool_resource/is_equal.cc b/libstdc++-v3/testsuite/20_util/synchronized_pool_resource/is_equal.cc
index ee2b974fff78ba32f2cb2112ee4229ed3251bc7f..53804d347af4b0b4d4959a5d91c76729c0e832e3 100644
--- a/libstdc++-v3/testsuite/20_util/synchronized_pool_resource/is_equal.cc
+++ b/libstdc++-v3/testsuite/20_util/synchronized_pool_resource/is_equal.cc
@@ -16,7 +16,7 @@
 // <http://www.gnu.org/licenses/>.
 
 // { dg-do run }
-// { dg-options "-std=gnu++17 -pthread" }
+// { dg-options "-pthread" }
 // { dg-require-effective-target c++17 }
 // { dg-require-effective-target pthread }
 // { dg-require-gthreads "" }
diff --git a/libstdc++-v3/testsuite/20_util/synchronized_pool_resource/multithreaded.cc b/libstdc++-v3/testsuite/20_util/synchronized_pool_resource/multithreaded.cc
index 4bf54ea955aba212c499f782b5b4552b83b76416..45a5a5bfef75afc7db4fdfdb16c733a1481ba9bf 100644
--- a/libstdc++-v3/testsuite/20_util/synchronized_pool_resource/multithreaded.cc
+++ b/libstdc++-v3/testsuite/20_util/synchronized_pool_resource/multithreaded.cc
@@ -16,7 +16,7 @@
 // <http://www.gnu.org/licenses/>.
 
 // { dg-do run }
-// { dg-options "-std=gnu++17 -pthread" }
+// { dg-options "-pthread" }
 // { dg-require-effective-target c++17 }
 // { dg-require-effective-target pthread }
 // { dg-require-gthreads "" }
diff --git a/libstdc++-v3/testsuite/20_util/synchronized_pool_resource/options.cc b/libstdc++-v3/testsuite/20_util/synchronized_pool_resource/options.cc
index 7a41e647c1169d7a25bb54c7a529304e90f14779..c324c5341efb29391d2c0540a99ef2a549e2f722 100644
--- a/libstdc++-v3/testsuite/20_util/synchronized_pool_resource/options.cc
+++ b/libstdc++-v3/testsuite/20_util/synchronized_pool_resource/options.cc
@@ -16,7 +16,7 @@
 // <http://www.gnu.org/licenses/>.
 
 // { dg-do run }
-// { dg-options "-std=gnu++17 -pthread" }
+// { dg-options "-pthread" }
 // { dg-require-effective-target c++17 }
 // { dg-require-effective-target pthread }
 // { dg-require-gthreads "" }
diff --git a/libstdc++-v3/testsuite/20_util/synchronized_pool_resource/release.cc b/libstdc++-v3/testsuite/20_util/synchronized_pool_resource/release.cc
index 074d3f85d8559682bf71f43d055c4e2a704e8744..1580304baabdeb525f4e729c8ed42de78a263ea3 100644
--- a/libstdc++-v3/testsuite/20_util/synchronized_pool_resource/release.cc
+++ b/libstdc++-v3/testsuite/20_util/synchronized_pool_resource/release.cc
@@ -16,7 +16,7 @@
 // <http://www.gnu.org/licenses/>.
 
 // { dg-do run }
-// { dg-options "-std=gnu++17 -pthread" }
+// { dg-options "-pthread" }
 // { dg-require-effective-target c++17 }
 // { dg-require-effective-target pthread }
 // { dg-require-gthreads "" }
diff --git a/libstdc++-v3/testsuite/20_util/synchronized_pool_resource/release_single.cc b/libstdc++-v3/testsuite/20_util/synchronized_pool_resource/release_single.cc
index 5e2067d08000a3a51eb4cdf7cf25afea70188c59..250920443bd9565d9f8de22c714806e072265536 100644
--- a/libstdc++-v3/testsuite/20_util/synchronized_pool_resource/release_single.cc
+++ b/libstdc++-v3/testsuite/20_util/synchronized_pool_resource/release_single.cc
@@ -16,7 +16,6 @@
 // <http://www.gnu.org/licenses/>.
 
 // { dg-do run }
-// { dg-options "-std=gnu++17" }
 // { dg-require-effective-target c++17 }
 // { dg-require-gthreads "" }
 
diff --git a/libstdc++-v3/testsuite/20_util/unsynchronized_pool_resource/allocate-max-chunks.cc b/libstdc++-v3/testsuite/20_util/unsynchronized_pool_resource/allocate-max-chunks.cc
index fea3e18ccbbfdf8123b61d1caab8a37878f0d753..c3cc858b12bffef44771ecd57ebb1dcbd94e375e 100644
--- a/libstdc++-v3/testsuite/20_util/unsynchronized_pool_resource/allocate-max-chunks.cc
+++ b/libstdc++-v3/testsuite/20_util/unsynchronized_pool_resource/allocate-max-chunks.cc
@@ -15,7 +15,6 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-options "-std=gnu++17" }
 // { dg-do run { target c++17 } }
 
 #include <memory_resource>
diff --git a/libstdc++-v3/testsuite/20_util/unsynchronized_pool_resource/allocate.cc b/libstdc++-v3/testsuite/20_util/unsynchronized_pool_resource/allocate.cc
index 79fac01fb258428ed116cba71f0249e4bb8a0371..a76afbe87a2ee1ae86c67890bafade13df293c44 100644
--- a/libstdc++-v3/testsuite/20_util/unsynchronized_pool_resource/allocate.cc
+++ b/libstdc++-v3/testsuite/20_util/unsynchronized_pool_resource/allocate.cc
@@ -15,7 +15,6 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-options "-std=gnu++17" }
 // { dg-do run { target c++17 } }
 
 #include <memory_resource>
diff --git a/libstdc++-v3/testsuite/20_util/unsynchronized_pool_resource/cons.cc b/libstdc++-v3/testsuite/20_util/unsynchronized_pool_resource/cons.cc
index 86b55ee47b9eb41ed48be628a14ae2ed045ce411..fd9113368d7aadb2c1c026aad7e6a352d16da3d0 100644
--- a/libstdc++-v3/testsuite/20_util/unsynchronized_pool_resource/cons.cc
+++ b/libstdc++-v3/testsuite/20_util/unsynchronized_pool_resource/cons.cc
@@ -15,7 +15,6 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-options "-std=gnu++17" }
 // { dg-do run { target c++17 } }
 
 #include <memory_resource>
diff --git a/libstdc++-v3/testsuite/20_util/unsynchronized_pool_resource/is_equal.cc b/libstdc++-v3/testsuite/20_util/unsynchronized_pool_resource/is_equal.cc
index 8ffc5dc7f2f86483232c8b79b9361d1923f3ba95..2707167cf6f3b7db7f9ccc41f55be50022f9879d 100644
--- a/libstdc++-v3/testsuite/20_util/unsynchronized_pool_resource/is_equal.cc
+++ b/libstdc++-v3/testsuite/20_util/unsynchronized_pool_resource/is_equal.cc
@@ -15,7 +15,6 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-options "-std=gnu++17" }
 // { dg-do run { target c++17 } }
 
 #include <memory_resource>
diff --git a/libstdc++-v3/testsuite/20_util/unsynchronized_pool_resource/options.cc b/libstdc++-v3/testsuite/20_util/unsynchronized_pool_resource/options.cc
index d746a6a21ebe02ff42fe4052d83009d0681bac4f..f3989a144e85ea20df02400a82a944cfcdcee80e 100644
--- a/libstdc++-v3/testsuite/20_util/unsynchronized_pool_resource/options.cc
+++ b/libstdc++-v3/testsuite/20_util/unsynchronized_pool_resource/options.cc
@@ -15,7 +15,6 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-options "-std=gnu++17" }
 // { dg-do run { target c++17 } }
 
 #include <memory_resource>
diff --git a/libstdc++-v3/testsuite/20_util/unsynchronized_pool_resource/release.cc b/libstdc++-v3/testsuite/20_util/unsynchronized_pool_resource/release.cc
index bd2ccd2eda8324bd7a086b51c8d6b6384009663f..3ff6bd41689081e455c6d45e243c510a4e9d2520 100644
--- a/libstdc++-v3/testsuite/20_util/unsynchronized_pool_resource/release.cc
+++ b/libstdc++-v3/testsuite/20_util/unsynchronized_pool_resource/release.cc
@@ -15,7 +15,6 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-options "-std=gnu++17" }
 // { dg-do run { target c++17 } }
 
 #include <memory_resource>
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/types/pmr_typedefs.cc b/libstdc++-v3/testsuite/21_strings/basic_string/types/pmr_typedefs.cc
index 431603b2ae4fc7e2d366a389e9fb641108ba6c23..cb597a743121e2621290d3105d0497b3a4326f07 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/types/pmr_typedefs.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/types/pmr_typedefs.cc
@@ -15,7 +15,6 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-options "-std=gnu++17" }
 // { dg-do compile { target c++17 } }
 // { dg-require-effective-target cxx11-abi }
 
diff --git a/libstdc++-v3/testsuite/23_containers/deque/types/pmr_typedefs.cc b/libstdc++-v3/testsuite/23_containers/deque/types/pmr_typedefs.cc
index 0e447197ba6254f181636d1620fd030f7fbcbf3a..4c428214b20c3f9dc6b3a43f3860fc3f3c3751f1 100644
--- a/libstdc++-v3/testsuite/23_containers/deque/types/pmr_typedefs.cc
+++ b/libstdc++-v3/testsuite/23_containers/deque/types/pmr_typedefs.cc
@@ -15,7 +15,6 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-options "-std=gnu++17" }
 // { dg-do compile { target c++17 } }
 
 #include <deque>
diff --git a/libstdc++-v3/testsuite/23_containers/deque/types/pmr_typedefs_debug.cc b/libstdc++-v3/testsuite/23_containers/deque/types/pmr_typedefs_debug.cc
index 401f4a88586e407006a3577526c73d420d447648..90c19027dbb5be770cc79eaa244441f465fc6b4c 100644
--- a/libstdc++-v3/testsuite/23_containers/deque/types/pmr_typedefs_debug.cc
+++ b/libstdc++-v3/testsuite/23_containers/deque/types/pmr_typedefs_debug.cc
@@ -15,7 +15,7 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-options "-std=gnu++17 -D_GLIBCXX_DEBUG" }
+// { dg-options "-D_GLIBCXX_DEBUG" }
 // { dg-do compile { target c++17 } }
 // { dg-skip-if "" { *-*-* } { "-D_GLIBCXX_PARALLEL" } }
 
diff --git a/libstdc++-v3/testsuite/23_containers/forward_list/pmr_typedefs.cc b/libstdc++-v3/testsuite/23_containers/forward_list/pmr_typedefs.cc
index a8aac325caadeee96b9b79a4b54a4dbb6b4ab694..107d764fb26a3906c300a9c5c75671a5ff27ad2f 100644
--- a/libstdc++-v3/testsuite/23_containers/forward_list/pmr_typedefs.cc
+++ b/libstdc++-v3/testsuite/23_containers/forward_list/pmr_typedefs.cc
@@ -15,7 +15,6 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-options "-std=gnu++17" }
 // { dg-do compile { target c++17 } }
 
 #include <forward_list>
diff --git a/libstdc++-v3/testsuite/23_containers/forward_list/pmr_typedefs_debug.cc b/libstdc++-v3/testsuite/23_containers/forward_list/pmr_typedefs_debug.cc
index ecd9da004f3364f360c6a7c5787c7e9e8fad5364..c183b2f195966ffd67ddbe5e827c07d01a23318c 100644
--- a/libstdc++-v3/testsuite/23_containers/forward_list/pmr_typedefs_debug.cc
+++ b/libstdc++-v3/testsuite/23_containers/forward_list/pmr_typedefs_debug.cc
@@ -15,7 +15,7 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-options "-std=gnu++17 -D_GLIBCXX_DEBUG" }
+// { dg-options "-D_GLIBCXX_DEBUG" }
 // { dg-do compile { target c++17 } }
 // { dg-skip-if "" { *-*-* } { "-D_GLIBCXX_PARALLEL" } }
 
diff --git a/libstdc++-v3/testsuite/23_containers/list/pmr_typedefs.cc b/libstdc++-v3/testsuite/23_containers/list/pmr_typedefs.cc
index d647c71ccaddbabd464ec095bd616ea8bc269ddb..f4908b91f96a3c8728dfa7fea04dd17397b07342 100644
--- a/libstdc++-v3/testsuite/23_containers/list/pmr_typedefs.cc
+++ b/libstdc++-v3/testsuite/23_containers/list/pmr_typedefs.cc
@@ -15,7 +15,6 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-options "-std=gnu++17" }
 // { dg-do compile { target c++17 } }
 
 #include <list>
diff --git a/libstdc++-v3/testsuite/23_containers/list/pmr_typedefs_debug.cc b/libstdc++-v3/testsuite/23_containers/list/pmr_typedefs_debug.cc
index 58e973afcad26c63309fa9859b01ccbee0528371..4be0b7fe5035501b4b56cfaab9bddcc1f234b8ac 100644
--- a/libstdc++-v3/testsuite/23_containers/list/pmr_typedefs_debug.cc
+++ b/libstdc++-v3/testsuite/23_containers/list/pmr_typedefs_debug.cc
@@ -15,7 +15,7 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-options "-std=gnu++17 -D_GLIBCXX_DEBUG" }
+// { dg-options "-D_GLIBCXX_DEBUG" }
 // { dg-do compile { target c++17 } }
 // { dg-skip-if "" { *-*-* } { "-D_GLIBCXX_PARALLEL" } }
 
diff --git a/libstdc++-v3/testsuite/23_containers/map/pmr_typedefs.cc b/libstdc++-v3/testsuite/23_containers/map/pmr_typedefs.cc
index 1cab36ba59aed44adbbc77cc8318a9cf703a476a..7ea3b6a20738a15eac28ed009620815805bfd590 100644
--- a/libstdc++-v3/testsuite/23_containers/map/pmr_typedefs.cc
+++ b/libstdc++-v3/testsuite/23_containers/map/pmr_typedefs.cc
@@ -15,7 +15,6 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-options "-std=gnu++17" }
 // { dg-do compile { target c++17 } }
 
 #include <map>
diff --git a/libstdc++-v3/testsuite/23_containers/map/pmr_typedefs_debug.cc b/libstdc++-v3/testsuite/23_containers/map/pmr_typedefs_debug.cc
index aed35cc0075c9c9d42e91d9ec1ab002a6ade2d5a..f07e68a80984025b368ebb395788d3ee1e784e82 100644
--- a/libstdc++-v3/testsuite/23_containers/map/pmr_typedefs_debug.cc
+++ b/libstdc++-v3/testsuite/23_containers/map/pmr_typedefs_debug.cc
@@ -15,7 +15,7 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-options "-std=gnu++17 -D_GLIBCXX_DEBUG" }
+// { dg-options "-D_GLIBCXX_DEBUG" }
 // { dg-do compile { target c++17 } }
 // { dg-skip-if "" { *-*-* } { "-D_GLIBCXX_PARALLEL" } }
 
diff --git a/libstdc++-v3/testsuite/23_containers/multimap/pmr_typedefs.cc b/libstdc++-v3/testsuite/23_containers/multimap/pmr_typedefs.cc
index 70345958a66196ec44d67a80d677caa7ea902dcb..54119f8c8504c5af3fcbee2dbc35cbb685b4dc5d 100644
--- a/libstdc++-v3/testsuite/23_containers/multimap/pmr_typedefs.cc
+++ b/libstdc++-v3/testsuite/23_containers/multimap/pmr_typedefs.cc
@@ -15,7 +15,6 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-options "-std=gnu++17" }
 // { dg-do compile { target c++17 } }
 
 #include <map>
diff --git a/libstdc++-v3/testsuite/23_containers/multimap/pmr_typedefs_debug.cc b/libstdc++-v3/testsuite/23_containers/multimap/pmr_typedefs_debug.cc
index 45c85f1a9fe76eb9620f6d110e48f748c29b38ac..6f466754a3250a67d1c2abd7591ebf605ff356d5 100644
--- a/libstdc++-v3/testsuite/23_containers/multimap/pmr_typedefs_debug.cc
+++ b/libstdc++-v3/testsuite/23_containers/multimap/pmr_typedefs_debug.cc
@@ -15,7 +15,7 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-options "-std=gnu++17 -D_GLIBCXX_DEBUG" }
+// { dg-options "-D_GLIBCXX_DEBUG" }
 // { dg-do compile { target c++17 } }
 // { dg-skip-if "" { *-*-* } { "-D_GLIBCXX_PARALLEL" } }
 
diff --git a/libstdc++-v3/testsuite/23_containers/multiset/pmr_typedefs.cc b/libstdc++-v3/testsuite/23_containers/multiset/pmr_typedefs.cc
index 4fd7dc70de28810556dc1e01250706432d3defaf..075bb8f25f8bed835d671233d0ec4196524b0535 100644
--- a/libstdc++-v3/testsuite/23_containers/multiset/pmr_typedefs.cc
+++ b/libstdc++-v3/testsuite/23_containers/multiset/pmr_typedefs.cc
@@ -15,7 +15,6 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-options "-std=gnu++17" }
 // { dg-do compile { target c++17 } }
 
 #include <set>
diff --git a/libstdc++-v3/testsuite/23_containers/multiset/pmr_typedefs_debug.cc b/libstdc++-v3/testsuite/23_containers/multiset/pmr_typedefs_debug.cc
index 287b5da41c05a6b120845943af2abe320b6bda34..c13da382284ebe0f24a71d3f60deb47799f6ae7f 100644
--- a/libstdc++-v3/testsuite/23_containers/multiset/pmr_typedefs_debug.cc
+++ b/libstdc++-v3/testsuite/23_containers/multiset/pmr_typedefs_debug.cc
@@ -15,7 +15,7 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-options "-std=gnu++17 -D_GLIBCXX_DEBUG" }
+// { dg-options "-D_GLIBCXX_DEBUG" }
 // { dg-do compile { target c++17 } }
 // { dg-skip-if "" { *-*-* } { "-D_GLIBCXX_PARALLEL" } }
 
diff --git a/libstdc++-v3/testsuite/23_containers/set/pmr_typedefs.cc b/libstdc++-v3/testsuite/23_containers/set/pmr_typedefs.cc
index 13e77fce91eb842d0a26562b73b54fba8fddfb5c..2a0551f5127a26f28352a502e58b194149ac3290 100644
--- a/libstdc++-v3/testsuite/23_containers/set/pmr_typedefs.cc
+++ b/libstdc++-v3/testsuite/23_containers/set/pmr_typedefs.cc
@@ -15,7 +15,6 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-options "-std=gnu++17" }
 // { dg-do compile { target c++17 } }
 
 #include <set>
diff --git a/libstdc++-v3/testsuite/23_containers/set/pmr_typedefs_debug.cc b/libstdc++-v3/testsuite/23_containers/set/pmr_typedefs_debug.cc
index f937d9f6d25e544e56a764f9200d8a7dad4a57e7..7a4d05146cf39235e86fd6d17b95aecfcd2f66d7 100644
--- a/libstdc++-v3/testsuite/23_containers/set/pmr_typedefs_debug.cc
+++ b/libstdc++-v3/testsuite/23_containers/set/pmr_typedefs_debug.cc
@@ -15,7 +15,7 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-options "-std=gnu++17 -D_GLIBCXX_DEBUG" }
+// { dg-options "-D_GLIBCXX_DEBUG" }
 // { dg-do compile { target c++17 } }
 // { dg-skip-if "" { *-*-* } { "-D_GLIBCXX_PARALLEL" } }
 
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_map/pmr_typedefs.cc b/libstdc++-v3/testsuite/23_containers/unordered_map/pmr_typedefs.cc
index de5db5ea873f35dea7a3809a6b57845424d2530f..aeb94a1c78f31ace8adf32ef82e2375b8ee87d9a 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_map/pmr_typedefs.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_map/pmr_typedefs.cc
@@ -15,7 +15,6 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-options "-std=gnu++17" }
 // { dg-do compile { target c++17 } }
 
 #include <unordered_map>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_map/pmr_typedefs_debug.cc b/libstdc++-v3/testsuite/23_containers/unordered_map/pmr_typedefs_debug.cc
index cf41df0f23021406be8b10992d55825ba7701a66..2830b70cb820830923aea5474db4edb5a5271afd 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_map/pmr_typedefs_debug.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_map/pmr_typedefs_debug.cc
@@ -15,7 +15,7 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-options "-std=gnu++17 -D_GLIBCXX_DEBUG" }
+// { dg-options "-D_GLIBCXX_DEBUG" }
 // { dg-do compile { target c++17 } }
 // { dg-skip-if "" { *-*-* } { "-D_GLIBCXX_PARALLEL" } }
 
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multimap/pmr_typedefs.cc b/libstdc++-v3/testsuite/23_containers/unordered_multimap/pmr_typedefs.cc
index 9bfcbdea09e892598f63d5f49c531f4049d61415..e10f9adae345103a1db51261220ede576a04d1e4 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multimap/pmr_typedefs.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multimap/pmr_typedefs.cc
@@ -15,7 +15,6 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-options "-std=gnu++17" }
 // { dg-do compile { target c++17 } }
 
 #include <unordered_map>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multimap/pmr_typedefs_debug.cc b/libstdc++-v3/testsuite/23_containers/unordered_multimap/pmr_typedefs_debug.cc
index 80a018898ebb892660985c8b2373876a57a731b3..72d4997ee9ac8626c063ddbe5548b5512a3fa3ab 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multimap/pmr_typedefs_debug.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multimap/pmr_typedefs_debug.cc
@@ -15,7 +15,7 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-options "-std=gnu++17 -D_GLIBCXX_DEBUG" }
+// { dg-options "-D_GLIBCXX_DEBUG" }
 // { dg-do compile { target c++17 } }
 // { dg-skip-if "" { *-*-* } { "-D_GLIBCXX_PARALLEL" } }
 
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multiset/pmr_typedefs.cc b/libstdc++-v3/testsuite/23_containers/unordered_multiset/pmr_typedefs.cc
index 255ad01e74c2ed1ee72798273dd7022b33fce1ac..d9e5e4c838c94d6c9bd2bd31c4ba54f8f3f55261 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multiset/pmr_typedefs.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multiset/pmr_typedefs.cc
@@ -15,7 +15,6 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-options "-std=gnu++17" }
 // { dg-do compile { target c++17 } }
 
 #include <unordered_set>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multiset/pmr_typedefs_debug.cc b/libstdc++-v3/testsuite/23_containers/unordered_multiset/pmr_typedefs_debug.cc
index a76b5f3b3a3d18afa7e2ee402677f0f974cfaf25..5318275535b51416a77bad2dd6797a4e479cd6b7 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multiset/pmr_typedefs_debug.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multiset/pmr_typedefs_debug.cc
@@ -15,7 +15,7 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-options "-std=gnu++17 -D_GLIBCXX_DEBUG" }
+// { dg-options "-D_GLIBCXX_DEBUG" }
 // { dg-do compile { target c++17 } }
 // { dg-skip-if "" { *-*-* } { "-D_GLIBCXX_PARALLEL" } }
 
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_set/pmr_typedefs.cc b/libstdc++-v3/testsuite/23_containers/unordered_set/pmr_typedefs.cc
index 280309293d0f8e59260ea1c00792a4b9d2fa6b07..14e4cf36ca6cd070282fddd94327e72810984b07 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_set/pmr_typedefs.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_set/pmr_typedefs.cc
@@ -15,7 +15,6 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-options "-std=gnu++17" }
 // { dg-do compile { target c++17 } }
 
 #include <unordered_set>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_set/pmr_typedefs_debug.cc b/libstdc++-v3/testsuite/23_containers/unordered_set/pmr_typedefs_debug.cc
index b647f5c872e7a1cfce3eff9c877d0c7fe95b1879..db06d8b6d170cfa8a75173fb1091134927d6282c 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_set/pmr_typedefs_debug.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_set/pmr_typedefs_debug.cc
@@ -15,7 +15,7 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-options "-std=gnu++17 -D_GLIBCXX_DEBUG" }
+// { dg-options "-D_GLIBCXX_DEBUG" }
 // { dg-do compile { target c++17 } }
 // { dg-skip-if "" { *-*-* } { "-D_GLIBCXX_PARALLEL" } }
 
diff --git a/libstdc++-v3/testsuite/23_containers/vector/pmr_typedefs.cc b/libstdc++-v3/testsuite/23_containers/vector/pmr_typedefs.cc
index 09a3568fd44e91f03bea488ff26488683619b5e6..38ff8e7d505de2af8f403b019d5d5e29888e6867 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/pmr_typedefs.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/pmr_typedefs.cc
@@ -15,7 +15,6 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-options "-std=gnu++17" }
 // { dg-do compile { target c++17 } }
 
 #include <vector>
diff --git a/libstdc++-v3/testsuite/23_containers/vector/types/pmr_typedefs_debug.cc b/libstdc++-v3/testsuite/23_containers/vector/types/pmr_typedefs_debug.cc
index fbe7a2a1a34bd93f7e6e4007224028fd06a279e9..8eb9802be58a7c910fe43fc45d86761edf37cfdd 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/types/pmr_typedefs_debug.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/types/pmr_typedefs_debug.cc
@@ -15,7 +15,7 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-options "-std=gnu++17 -D_GLIBCXX_DEBUG" }
+// { dg-options "-D_GLIBCXX_DEBUG" }
 // { dg-do compile { target c++17 } }
 // { dg-skip-if "" { *-*-* } { "-D_GLIBCXX_PARALLEL" } }
 
diff --git a/libstdc++-v3/testsuite/28_regex/match_results/pmr_typedefs.cc b/libstdc++-v3/testsuite/28_regex/match_results/pmr_typedefs.cc
index fcb63e5dc846b586815f9fc32a3a07121b683a48..3df502d5bf73cdf03bd3a8c62b0c79178fdc7ef5 100644
--- a/libstdc++-v3/testsuite/28_regex/match_results/pmr_typedefs.cc
+++ b/libstdc++-v3/testsuite/28_regex/match_results/pmr_typedefs.cc
@@ -15,7 +15,6 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-options "-std=gnu++17" }
 // { dg-do compile { target c++17 } }
 // { dg-timeout-factor 2 }
 // { dg-require-effective-target cxx11-abi }