diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/algorithm.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/algorithm.version.pass.cpp
index efbe87c3c7d552..4e570d2d69e045 100644
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/algorithm.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/algorithm.version.pass.cpp
@@ -8,6 +8,8 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
+//
+// clang-format off
 
 // <algorithm>
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/any.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/any.version.pass.cpp
index 7ea99df8df3428..cd393b2b404b95 100644
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/any.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/any.version.pass.cpp
@@ -8,6 +8,8 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
+//
+// clang-format off
 
 // <any>
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/array.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/array.version.pass.cpp
index 4cc0f8c8c8081c..b0dedfb4a7b0e8 100644
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/array.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/array.version.pass.cpp
@@ -8,6 +8,8 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
+//
+// clang-format off
 
 // <array>
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/atomic.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/atomic.version.pass.cpp
index 16e4e375381952..b964e0c6921e28 100644
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/atomic.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/atomic.version.pass.cpp
@@ -8,6 +8,8 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
+//
+// clang-format off
 
 // UNSUPPORTED: libcpp-has-no-threads
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/barrier.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/barrier.version.pass.cpp
index f485b794885874..b193095403e9af 100644
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/barrier.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/barrier.version.pass.cpp
@@ -8,6 +8,8 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
+//
+// clang-format off
 
 // UNSUPPORTED: libcpp-has-no-threads
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/bit.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/bit.version.pass.cpp
index c88e80a81d6742..4ae4949d4ff201 100644
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/bit.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/bit.version.pass.cpp
@@ -8,6 +8,8 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
+//
+// clang-format off
 
 // <bit>
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/chrono.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/chrono.version.pass.cpp
index e0e699634f7092..58af9a474b37c3 100644
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/chrono.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/chrono.version.pass.cpp
@@ -8,6 +8,8 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
+//
+// clang-format off
 
 // <chrono>
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/cmath.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/cmath.version.pass.cpp
index eabf7e7028b140..5a1017102239d6 100644
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/cmath.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/cmath.version.pass.cpp
@@ -8,6 +8,8 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
+//
+// clang-format off
 
 // <cmath>
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/compare.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/compare.version.pass.cpp
index 76f9a101bd11ed..14a19e0972849c 100644
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/compare.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/compare.version.pass.cpp
@@ -8,6 +8,8 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
+//
+// clang-format off
 
 // <compare>
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/complex.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/complex.version.pass.cpp
index 48515287773540..c48a1894eada50 100644
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/complex.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/complex.version.pass.cpp
@@ -8,6 +8,8 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
+//
+// clang-format off
 
 // <complex>
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/concepts.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/concepts.version.pass.cpp
index 442301c804f9c5..4ca51bdd8c34f9 100644
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/concepts.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/concepts.version.pass.cpp
@@ -8,6 +8,8 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
+//
+// clang-format off
 
 // <concepts>
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/cstddef.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/cstddef.version.pass.cpp
index cba6bec13ccaf8..c2b970a0c753a9 100644
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/cstddef.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/cstddef.version.pass.cpp
@@ -8,6 +8,8 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
+//
+// clang-format off
 
 // <cstddef>
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/deque.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/deque.version.pass.cpp
index 54fe25726fd2cb..ec2036141e873d 100644
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/deque.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/deque.version.pass.cpp
@@ -8,6 +8,8 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
+//
+// clang-format off
 
 // <deque>
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/exception.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/exception.version.pass.cpp
index 4a420c611e2641..d14e9a7f7130c4 100644
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/exception.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/exception.version.pass.cpp
@@ -8,6 +8,8 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
+//
+// clang-format off
 
 // <exception>
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/execution.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/execution.version.pass.cpp
index 54d2995a6b722e..8b2a75568a9ec2 100644
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/execution.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/execution.version.pass.cpp
@@ -8,6 +8,8 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
+//
+// clang-format off
 
 // <execution>
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/filesystem.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/filesystem.version.pass.cpp
index 815c00d694ee8e..44850780d3158b 100644
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/filesystem.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/filesystem.version.pass.cpp
@@ -8,6 +8,8 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
+//
+// clang-format off
 
 // <filesystem>
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/forward_list.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/forward_list.version.pass.cpp
index a890aff5691c2b..2fc17258651833 100644
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/forward_list.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/forward_list.version.pass.cpp
@@ -8,6 +8,8 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
+//
+// clang-format off
 
 // <forward_list>
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/functional.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/functional.version.pass.cpp
index 6fa1ac6ada5b3e..6e65a8fbd77479 100644
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/functional.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/functional.version.pass.cpp
@@ -8,6 +8,8 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
+//
+// clang-format off
 
 // <functional>
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/iomanip.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/iomanip.version.pass.cpp
index 45df7e509e637e..38d8f27ff1b05d 100644
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/iomanip.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/iomanip.version.pass.cpp
@@ -8,6 +8,8 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
+//
+// clang-format off
 
 // UNSUPPORTED: libcpp-has-no-localization
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/istream.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/istream.version.pass.cpp
index 60dde8e60279de..9ea01ebe06dff3 100644
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/istream.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/istream.version.pass.cpp
@@ -8,6 +8,8 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
+//
+// clang-format off
 
 // UNSUPPORTED: libcpp-has-no-localization
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/iterator.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/iterator.version.pass.cpp
index f36d28594516a9..27318c51a0a094 100644
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/iterator.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/iterator.version.pass.cpp
@@ -8,6 +8,8 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
+//
+// clang-format off
 
 // <iterator>
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/latch.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/latch.version.pass.cpp
index ebeebec3237789..29e8fd617bbfe5 100644
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/latch.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/latch.version.pass.cpp
@@ -8,6 +8,8 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
+//
+// clang-format off
 
 // UNSUPPORTED: libcpp-has-no-threads
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/limits.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/limits.version.pass.cpp
index 72d0e0b7c22409..fecb03d1867b82 100644
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/limits.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/limits.version.pass.cpp
@@ -8,6 +8,8 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
+//
+// clang-format off
 
 // <limits>
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/list.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/list.version.pass.cpp
index fa455cf0d4bfbc..92d0c0f2379174 100644
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/list.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/list.version.pass.cpp
@@ -8,6 +8,8 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
+//
+// clang-format off
 
 // <list>
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/locale.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/locale.version.pass.cpp
index 6f63f67670b1e4..f9620763c7629b 100644
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/locale.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/locale.version.pass.cpp
@@ -8,6 +8,8 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
+//
+// clang-format off
 
 // UNSUPPORTED: libcpp-has-no-localization
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/map.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/map.version.pass.cpp
index 4410a5a6a6132b..85c5b46d7e3f37 100644
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/map.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/map.version.pass.cpp
@@ -8,6 +8,8 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
+//
+// clang-format off
 
 // <map>
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/memory.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/memory.version.pass.cpp
index 71ab699ef18924..7be4372b8d7ea3 100644
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/memory.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/memory.version.pass.cpp
@@ -8,6 +8,8 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
+//
+// clang-format off
 
 // <memory>
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/mutex.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/mutex.version.pass.cpp
index 9896953457a3b7..9e76cfb757459f 100644
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/mutex.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/mutex.version.pass.cpp
@@ -8,6 +8,8 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
+//
+// clang-format off
 
 // <mutex>
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/new.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/new.version.pass.cpp
index c937438c753402..5fbb8afe14ab17 100644
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/new.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/new.version.pass.cpp
@@ -8,6 +8,8 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
+//
+// clang-format off
 
 // <new>
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/numbers.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/numbers.version.pass.cpp
index 96619ab92c6f48..9e6b1fa8654048 100644
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/numbers.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/numbers.version.pass.cpp
@@ -8,6 +8,8 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
+//
+// clang-format off
 
 // <numbers>
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/numeric.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/numeric.version.pass.cpp
index f6c76977b545dd..afdb176bea437b 100644
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/numeric.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/numeric.version.pass.cpp
@@ -8,6 +8,8 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
+//
+// clang-format off
 
 // <numeric>
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/optional.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/optional.version.pass.cpp
index d3a3ca7b9950f8..58c3a0e0dc54ee 100644
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/optional.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/optional.version.pass.cpp
@@ -8,6 +8,8 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
+//
+// clang-format off
 
 // <optional>
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/ostream.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/ostream.version.pass.cpp
index 2bc25a4d74d47b..586cd8ec6d5717 100644
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/ostream.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/ostream.version.pass.cpp
@@ -8,6 +8,8 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
+//
+// clang-format off
 
 // UNSUPPORTED: libcpp-has-no-localization
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/regex.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/regex.version.pass.cpp
index 14935710f32097..df1506a05e6eb0 100644
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/regex.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/regex.version.pass.cpp
@@ -8,6 +8,8 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
+//
+// clang-format off
 
 // UNSUPPORTED: libcpp-has-no-localization
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/scoped_allocator.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/scoped_allocator.version.pass.cpp
index 1ce7999ace2117..2e8f78d930e152 100644
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/scoped_allocator.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/scoped_allocator.version.pass.cpp
@@ -8,6 +8,8 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
+//
+// clang-format off
 
 // <scoped_allocator>
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/semaphore.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/semaphore.version.pass.cpp
index 463122161a76bd..febeb6f6c61557 100644
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/semaphore.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/semaphore.version.pass.cpp
@@ -8,6 +8,8 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
+//
+// clang-format off
 
 // UNSUPPORTED: libcpp-has-no-threads
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/set.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/set.version.pass.cpp
index 8dd54c86571b04..57fdd5b21f4011 100644
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/set.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/set.version.pass.cpp
@@ -8,6 +8,8 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
+//
+// clang-format off
 
 // <set>
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/shared_mutex.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/shared_mutex.version.pass.cpp
index c6151749b7c2fd..953fd0a37790a8 100644
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/shared_mutex.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/shared_mutex.version.pass.cpp
@@ -8,6 +8,8 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
+//
+// clang-format off
 
 // UNSUPPORTED: libcpp-has-no-threads
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/span.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/span.version.pass.cpp
index c8750fd446cbf9..0ff32da4ad3579 100644
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/span.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/span.version.pass.cpp
@@ -8,6 +8,8 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
+//
+// clang-format off
 
 // <span>
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/string.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/string.version.pass.cpp
index 25f6659e0d221e..1daadbaaf346fb 100644
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/string.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/string.version.pass.cpp
@@ -8,6 +8,8 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
+//
+// clang-format off
 
 // <string>
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/string_view.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/string_view.version.pass.cpp
index 6a82e02c366ead..a55ac8473f9af2 100644
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/string_view.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/string_view.version.pass.cpp
@@ -8,6 +8,8 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
+//
+// clang-format off
 
 // <string_view>
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/thread.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/thread.version.pass.cpp
index 284eabf9f7c878..c84c12490d899c 100644
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/thread.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/thread.version.pass.cpp
@@ -8,6 +8,8 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
+//
+// clang-format off
 
 // UNSUPPORTED: libcpp-has-no-threads
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/tuple.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/tuple.version.pass.cpp
index 4b95dd6d67f8b3..ef9f61428782fe 100644
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/tuple.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/tuple.version.pass.cpp
@@ -8,6 +8,8 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
+//
+// clang-format off
 
 // <tuple>
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/type_traits.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/type_traits.version.pass.cpp
index 9afaa1bcd047c9..04c6aaa81fd702 100644
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/type_traits.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/type_traits.version.pass.cpp
@@ -8,6 +8,8 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
+//
+// clang-format off
 
 // <type_traits>
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/unordered_map.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/unordered_map.version.pass.cpp
index b0ba18cb143c18..b8e20ff848ba43 100644
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/unordered_map.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/unordered_map.version.pass.cpp
@@ -8,6 +8,8 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
+//
+// clang-format off
 
 // <unordered_map>
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/unordered_set.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/unordered_set.version.pass.cpp
index d57f82b77f6884..89692c766ab7c4 100644
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/unordered_set.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/unordered_set.version.pass.cpp
@@ -8,6 +8,8 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
+//
+// clang-format off
 
 // <unordered_set>
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/utility.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/utility.version.pass.cpp
index b2842a592cd190..ab495be78e9a1a 100644
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/utility.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/utility.version.pass.cpp
@@ -8,6 +8,8 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
+//
+// clang-format off
 
 // <utility>
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/variant.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/variant.version.pass.cpp
index 10c7aa9dcc7d28..6d198d1121f744 100644
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/variant.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/variant.version.pass.cpp
@@ -8,6 +8,8 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
+//
+// clang-format off
 
 // <variant>
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/vector.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/vector.version.pass.cpp
index d6a7937b4c7038..e4fed01f4a08c9 100644
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/vector.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/vector.version.pass.cpp
@@ -8,6 +8,8 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
+//
+// clang-format off
 
 // <vector>
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/version.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/version.version.pass.cpp
index a75d6db28b22f0..664c8fe758393c 100644
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/version.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/version.version.pass.cpp
@@ -8,6 +8,8 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
+//
+// clang-format off
 
 // <version>
 
diff --git a/libcxx/utils/generate_feature_test_macro_components.py b/libcxx/utils/generate_feature_test_macro_components.py
index a58c41663066f7..daa40f2a15ac22 100755
--- a/libcxx/utils/generate_feature_test_macro_components.py
+++ b/libcxx/utils/generate_feature_test_macro_components.py
@@ -933,6 +933,8 @@ def produce_tests():
 //
 // WARNING: This test was generated by {script_name}
 // and should not be edited manually.
+//
+// clang-format off
 {markup}
 // <{header}>