diff --git a/test/thread/thread.mutex/thread.lock.algorithm/lock.pass.cpp b/test/thread/thread.mutex/thread.lock.algorithm/lock.pass.cpp
index 9f2ba4d99..4bae9569c 100644
--- a/test/thread/thread.mutex/thread.lock.algorithm/lock.pass.cpp
+++ b/test/thread/thread.mutex/thread.lock.algorithm/lock.pass.cpp
@@ -501,5 +501,5 @@ int main()
             assert(!l3.locked());
         }
     }
-#endif
+#endif  // _LIBCPP_HAS_NO_VARIADICS
 }
diff --git a/test/thread/thread.mutex/thread.lock.algorithm/try_lock.pass.cpp b/test/thread/thread.mutex/thread.lock.algorithm/try_lock.pass.cpp
index db6bd808b..c00d5da3e 100644
--- a/test/thread/thread.mutex/thread.lock.algorithm/try_lock.pass.cpp
+++ b/test/thread/thread.mutex/thread.lock.algorithm/try_lock.pass.cpp
@@ -69,8 +69,6 @@ public:
     bool locked() const {return locked_;}
 };
 
-
-
 int main()
 {
     {
@@ -512,5 +510,5 @@ int main()
         assert(!l2.locked());
         assert(!l3.locked());
     }
-#endif
+#endif  // _LIBCPP_HAS_NO_VARIADICS
 }
diff --git a/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.cons/move_assign.pass.cpp b/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.cons/move_assign.pass.cpp
index 0d739b407..125024ce0 100644
--- a/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.cons/move_assign.pass.cpp
+++ b/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.cons/move_assign.pass.cpp
@@ -29,5 +29,5 @@ int main()
     assert(lk1.owns_lock() == true);
     assert(lk0.mutex() == nullptr);
     assert(lk0.owns_lock() == false);
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.cons/move_ctor.pass.cpp b/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.cons/move_ctor.pass.cpp
index 0f17495d7..08cb78e64 100644
--- a/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.cons/move_ctor.pass.cpp
+++ b/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.cons/move_ctor.pass.cpp
@@ -27,5 +27,5 @@ int main()
     assert(lk.owns_lock() == true);
     assert(lk0.mutex() == nullptr);
     assert(lk0.owns_lock() == false);
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.cons/mutex_adopt_lock.pass.cpp b/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.cons/mutex_adopt_lock.pass.cpp
index 7c902c3a1..e60ae8d5d 100644
--- a/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.cons/mutex_adopt_lock.pass.cpp
+++ b/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.cons/mutex_adopt_lock.pass.cpp
@@ -16,8 +16,6 @@
 #include <mutex>
 #include <cassert>
 
-
-
 int main()
 {
     std::mutex m;
diff --git a/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.cons/mutex_defer_lock.pass.cpp b/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.cons/mutex_defer_lock.pass.cpp
index aeec4479a..575fc3147 100644
--- a/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.cons/mutex_defer_lock.pass.cpp
+++ b/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.cons/mutex_defer_lock.pass.cpp
@@ -16,8 +16,6 @@
 #include <mutex>
 #include <cassert>
 
-
-
 int main()
 {
     std::mutex m;
diff --git a/test/thread/thread.mutex/thread.lock/types.pass.cpp b/test/thread/thread.mutex/thread.lock/types.pass.cpp
index 190a524ad..9ca788864 100644
--- a/test/thread/thread.mutex/thread.lock/types.pass.cpp
+++ b/test/thread/thread.mutex/thread.lock/types.pass.cpp
@@ -12,7 +12,7 @@
 // struct defer_lock_t {};
 // struct try_to_lock_t {};
 // struct adopt_lock_t {};
-// 
+//
 // constexpr defer_lock_t  defer_lock{};
 // constexpr try_to_lock_t try_to_lock{};
 // constexpr adopt_lock_t  adopt_lock{};
diff --git a/test/thread/thread.mutex/thread.once/thread.once.callonce/call_once.pass.cpp b/test/thread/thread.mutex/thread.once/thread.once.callonce/call_once.pass.cpp
index 743ad69b6..b0fab7ea7 100644
--- a/test/thread/thread.mutex/thread.once/thread.once.callonce/call_once.pass.cpp
+++ b/test/thread/thread.mutex/thread.once/thread.once.callonce/call_once.pass.cpp
@@ -95,7 +95,7 @@ void f2()
     std::call_once(flg2, init2(), 4, 5);
 }
 
-#endif
+#endif  // _LIBCPP_HAS_NO_VARIADICS
 
 std::once_flag flg41;
 std::once_flag flg42;
@@ -129,7 +129,6 @@ void f42()
     std::call_once(flg41, init41);
 }
 
-
 int main()
 {
     // check basic functionality
@@ -175,5 +174,5 @@ int main()
         t1.join();
         assert(init2::called == 5);
     }
-#endif
+#endif  // _LIBCPP_HAS_NO_VARIADICS
 }
diff --git a/test/thread/thread.threads/thread.thread.class/thread.thread.assign/move.pass.cpp b/test/thread/thread.threads/thread.thread.class/thread.thread.assign/move.pass.cpp
index f870219b2..ff1cf57fd 100644
--- a/test/thread/thread.threads/thread.thread.class/thread.thread.assign/move.pass.cpp
+++ b/test/thread/thread.threads/thread.thread.class/thread.thread.assign/move.pass.cpp
@@ -78,5 +78,5 @@ int main()
         t0 = std::move(t1);
         assert(false);
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/thread/thread.threads/thread.thread.class/thread.thread.constr/F.pass.cpp b/test/thread/thread.threads/thread.thread.class/thread.thread.constr/F.pass.cpp
index 863541abd..e15c465e8 100644
--- a/test/thread/thread.threads/thread.thread.class/thread.thread.constr/F.pass.cpp
+++ b/test/thread/thread.threads/thread.thread.class/thread.thread.constr/F.pass.cpp
@@ -126,5 +126,5 @@ int main()
         assert(G::n_alive == 0);
         assert(G::op_run);
     }
-#endif
+#endif  // _LIBCPP_HAS_NO_VARIADICS
 }
diff --git a/test/thread/thread.threads/thread.thread.class/thread.thread.constr/move.pass.cpp b/test/thread/thread.threads/thread.thread.class/thread.thread.constr/move.pass.cpp
index a8e7a9f19..a28fd69f8 100644
--- a/test/thread/thread.threads/thread.thread.class/thread.thread.constr/move.pass.cpp
+++ b/test/thread/thread.threads/thread.thread.class/thread.thread.constr/move.pass.cpp
@@ -64,5 +64,5 @@ int main()
         assert(G::n_alive == 0);
         assert(G::op_run);
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/thread/thread.threads/thread.thread.class/thread.thread.destr/dtor.pass.cpp b/test/thread/thread.threads/thread.thread.class/thread.thread.destr/dtor.pass.cpp
index 5bf2e5fce..a59b8d306 100644
--- a/test/thread/thread.threads/thread.thread.class/thread.thread.destr/dtor.pass.cpp
+++ b/test/thread/thread.threads/thread.thread.class/thread.thread.destr/dtor.pass.cpp
@@ -18,7 +18,6 @@
 #include <cstdlib>
 #include <cassert>
 
-
 class G
 {
     int alive_;