diff --git a/test/language.support/support.dynamic/alloc.errors/new.handler/new_handler.pass.cpp b/test/language.support/support.dynamic/alloc.errors/new.handler/new_handler.pass.cpp
index 66bb720e0..74b225c42 100644
--- a/test/language.support/support.dynamic/alloc.errors/new.handler/new_handler.pass.cpp
+++ b/test/language.support/support.dynamic/alloc.errors/new.handler/new_handler.pass.cpp
@@ -6,7 +6,7 @@
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
- 
+
 // test new_handler
 
 #include <new>
diff --git a/test/language.support/support.dynamic/alloc.errors/set.new.handler/set_new_handler.pass.cpp b/test/language.support/support.dynamic/alloc.errors/set.new.handler/set_new_handler.pass.cpp
index 9c6fd7ce6..f3509101c 100644
--- a/test/language.support/support.dynamic/alloc.errors/set.new.handler/set_new_handler.pass.cpp
+++ b/test/language.support/support.dynamic/alloc.errors/set.new.handler/set_new_handler.pass.cpp
@@ -6,7 +6,7 @@
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
- 
+
 // test set_new_handler
 
 #include <new>
diff --git a/test/language.support/support.dynamic/new.delete/new.delete.array/new_array.pass.cpp b/test/language.support/support.dynamic/new.delete/new.delete.array/new_array.pass.cpp
index 142871d24..f29db6147 100644
--- a/test/language.support/support.dynamic/new.delete/new.delete.array/new_array.pass.cpp
+++ b/test/language.support/support.dynamic/new.delete/new.delete.array/new_array.pass.cpp
@@ -6,7 +6,7 @@
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
- 
+
  // test operator new[]
 
 #include <new>
diff --git a/test/language.support/support.dynamic/new.delete/new.delete.array/new_array_nothrow.pass.cpp b/test/language.support/support.dynamic/new.delete/new.delete.array/new_array_nothrow.pass.cpp
index da282b803..f00397566 100644
--- a/test/language.support/support.dynamic/new.delete/new.delete.array/new_array_nothrow.pass.cpp
+++ b/test/language.support/support.dynamic/new.delete/new.delete.array/new_array_nothrow.pass.cpp
@@ -6,7 +6,7 @@
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
- 
+
  // test operator new [] (nothrow)
 
 #include <new>
diff --git a/test/language.support/support.dynamic/new.delete/new.delete.array/new_array_nothrow_replace.pass.cpp b/test/language.support/support.dynamic/new.delete/new.delete.array/new_array_nothrow_replace.pass.cpp
index 91d93db15..566ea7bcc 100644
--- a/test/language.support/support.dynamic/new.delete/new.delete.array/new_array_nothrow_replace.pass.cpp
+++ b/test/language.support/support.dynamic/new.delete/new.delete.array/new_array_nothrow_replace.pass.cpp
@@ -6,7 +6,7 @@
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
- 
+
  // test operator new [] nothrow by replacing only operator new
 
 #include <new>
diff --git a/test/language.support/support.dynamic/new.delete/new.delete.array/new_array_replace.pass.cpp b/test/language.support/support.dynamic/new.delete/new.delete.array/new_array_replace.pass.cpp
index 3322c07fe..d733b58db 100644
--- a/test/language.support/support.dynamic/new.delete/new.delete.array/new_array_replace.pass.cpp
+++ b/test/language.support/support.dynamic/new.delete/new.delete.array/new_array_replace.pass.cpp
@@ -6,7 +6,7 @@
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
- 
+
  // test operator new[] replacement by replacing only operator new
 
 #include <new>
diff --git a/test/language.support/support.dynamic/new.delete/new.delete.single/new.pass.cpp b/test/language.support/support.dynamic/new.delete/new.delete.single/new.pass.cpp
index c1ed0b4e2..925abb072 100644
--- a/test/language.support/support.dynamic/new.delete/new.delete.single/new.pass.cpp
+++ b/test/language.support/support.dynamic/new.delete/new.delete.single/new.pass.cpp
@@ -6,7 +6,7 @@
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
- 
+
  // test operator new
 
 #include <new>
diff --git a/test/language.support/support.dynamic/new.delete/new.delete.single/new_nothrow.pass.cpp b/test/language.support/support.dynamic/new.delete/new.delete.single/new_nothrow.pass.cpp
index a9c052dae..19a9b5fdf 100644
--- a/test/language.support/support.dynamic/new.delete/new.delete.single/new_nothrow.pass.cpp
+++ b/test/language.support/support.dynamic/new.delete/new.delete.single/new_nothrow.pass.cpp
@@ -6,7 +6,7 @@
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
- 
+
  // test operator new (nothrow)
 
 #include <new>
diff --git a/test/language.support/support.dynamic/new.delete/new.delete.single/new_nothrow_replace.pass.cpp b/test/language.support/support.dynamic/new.delete/new.delete.single/new_nothrow_replace.pass.cpp
index b37b03178..ecb1426da 100644
--- a/test/language.support/support.dynamic/new.delete/new.delete.single/new_nothrow_replace.pass.cpp
+++ b/test/language.support/support.dynamic/new.delete/new.delete.single/new_nothrow_replace.pass.cpp
@@ -6,7 +6,7 @@
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
- 
+
  // test operator new nothrow by replacing only operator new
 
 #include <new>
diff --git a/test/language.support/support.dynamic/new.delete/new.delete.single/new_replace.pass.cpp b/test/language.support/support.dynamic/new.delete/new.delete.single/new_replace.pass.cpp
index f3d014f63..dd11b955a 100644
--- a/test/language.support/support.dynamic/new.delete/new.delete.single/new_replace.pass.cpp
+++ b/test/language.support/support.dynamic/new.delete/new.delete.single/new_replace.pass.cpp
@@ -6,7 +6,7 @@
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
- 
+
  // test operator new replacement
 
 #include <new>
diff --git a/test/language.support/support.exception/exception.terminate/set.terminate/set_terminate.pass.cpp b/test/language.support/support.exception/exception.terminate/set.terminate/set_terminate.pass.cpp
index 9a2c54979..bb70f334a 100644
--- a/test/language.support/support.exception/exception.terminate/set.terminate/set_terminate.pass.cpp
+++ b/test/language.support/support.exception/exception.terminate/set.terminate/set_terminate.pass.cpp
@@ -6,7 +6,7 @@
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
- 
+
 // test set_terminate
 
 #include <exception>
diff --git a/test/language.support/support.exception/exception.terminate/terminate.handler/terminate_handler.pass.cpp b/test/language.support/support.exception/exception.terminate/terminate.handler/terminate_handler.pass.cpp
index 53ec32c07..9b5302585 100644
--- a/test/language.support/support.exception/exception.terminate/terminate.handler/terminate_handler.pass.cpp
+++ b/test/language.support/support.exception/exception.terminate/terminate.handler/terminate_handler.pass.cpp
@@ -6,7 +6,7 @@
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
- 
+
 // test terminate_handler
 
 #include <exception>
diff --git a/test/language.support/support.exception/exception.terminate/terminate/terminate.pass.cpp b/test/language.support/support.exception/exception.terminate/terminate/terminate.pass.cpp
index 9ba1c80b3..9d3ba126d 100644
--- a/test/language.support/support.exception/exception.terminate/terminate/terminate.pass.cpp
+++ b/test/language.support/support.exception/exception.terminate/terminate/terminate.pass.cpp
@@ -6,7 +6,7 @@
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
- 
+
 // test terminate
 
 #include <exception>
diff --git a/test/language.support/support.exception/exception.unexpected/set.unexpected/set_unexpected.pass.cpp b/test/language.support/support.exception/exception.unexpected/set.unexpected/set_unexpected.pass.cpp
index 59ba90bc1..c113f6f2d 100644
--- a/test/language.support/support.exception/exception.unexpected/set.unexpected/set_unexpected.pass.cpp
+++ b/test/language.support/support.exception/exception.unexpected/set.unexpected/set_unexpected.pass.cpp
@@ -6,7 +6,7 @@
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
- 
+
 // test set_unexpected
 
 #include <exception>
@@ -25,9 +25,9 @@ int main()
 {
 	std::unexpected_handler old = std::set_unexpected(f1);
     // verify there is a previous unexpected handler
-	assert(old); 
+	assert(old);
 	// verify f1 was replace with f2
-    assert(std::set_unexpected(f2) == f1);  
+    assert(std::set_unexpected(f2) == f1);
 	// verify calling original unexpected handler calls terminate
 	std::set_terminate(f3);
 	(*old)();
diff --git a/test/language.support/support.exception/exception.unexpected/unexpected.handler/unexpected_handler.pass.cpp b/test/language.support/support.exception/exception.unexpected/unexpected.handler/unexpected_handler.pass.cpp
index da1dd4f43..50b3d3466 100644
--- a/test/language.support/support.exception/exception.unexpected/unexpected.handler/unexpected_handler.pass.cpp
+++ b/test/language.support/support.exception/exception.unexpected/unexpected.handler/unexpected_handler.pass.cpp
@@ -6,7 +6,7 @@
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
- 
+
 // test unexpected_handler
 
 #include <exception>
diff --git a/test/language.support/support.exception/exception.unexpected/unexpected/unexpected.pass.cpp b/test/language.support/support.exception/exception.unexpected/unexpected/unexpected.pass.cpp
index c960c0cc5..67cf90ae2 100644
--- a/test/language.support/support.exception/exception.unexpected/unexpected/unexpected.pass.cpp
+++ b/test/language.support/support.exception/exception.unexpected/unexpected/unexpected.pass.cpp
@@ -6,7 +6,7 @@
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
- 
+
 // test unexpected
 
 #include <exception>
diff --git a/test/language.support/support.initlist/types.pass.cpp b/test/language.support/support.initlist/types.pass.cpp
index 81ee2e37b..866df243f 100644
--- a/test/language.support/support.initlist/types.pass.cpp
+++ b/test/language.support/support.initlist/types.pass.cpp
@@ -15,7 +15,7 @@
 //     typedef const E& reference;
 //     typedef const E& const_reference;
 //     typedef size_t   size_type;
-// 
+//
 //     typedef const E* iterator;
 //     typedef const E* const_iterator;
 
diff --git a/test/language.support/support.limits/c.limits/cfloat.pass.cpp b/test/language.support/support.limits/c.limits/cfloat.pass.cpp
index fe6be80b7..f121ba35f 100644
--- a/test/language.support/support.limits/c.limits/cfloat.pass.cpp
+++ b/test/language.support/support.limits/c.limits/cfloat.pass.cpp
@@ -6,7 +6,7 @@
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
- 
+
  // test cfloat
 
 #include <cfloat>
diff --git a/test/language.support/support.limits/c.limits/climits.pass.cpp b/test/language.support/support.limits/c.limits/climits.pass.cpp
index 1b635014e..41709d953 100644
--- a/test/language.support/support.limits/c.limits/climits.pass.cpp
+++ b/test/language.support/support.limits/c.limits/climits.pass.cpp
@@ -6,7 +6,7 @@
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
- 
+
  // test climits
 
 #include <climits>
diff --git a/test/language.support/support.limits/limits/is_specialized.pass.cpp b/test/language.support/support.limits/limits/is_specialized.pass.cpp
index 4cc275460..8d0a5b22f 100644
--- a/test/language.support/support.limits/limits/is_specialized.pass.cpp
+++ b/test/language.support/support.limits/limits/is_specialized.pass.cpp
@@ -48,7 +48,7 @@ int main()
 #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
     test<char16_t>();
     test<char32_t>();
-#endif
+#endif  // _LIBCPP_HAS_NO_UNICODE_CHARS
     test<signed char>();
     test<unsigned char>();
     test<signed short>();
diff --git a/test/language.support/support.limits/limits/numeric.limits.members/denorm_min.pass.cpp b/test/language.support/support.limits/limits/numeric.limits.members/denorm_min.pass.cpp
index 56d01a6b7..2079c1182 100644
--- a/test/language.support/support.limits/limits/numeric.limits.members/denorm_min.pass.cpp
+++ b/test/language.support/support.limits/limits/numeric.limits.members/denorm_min.pass.cpp
@@ -34,7 +34,7 @@ int main()
 #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
     test<char16_t>(0);
     test<char32_t>(0);
-#endif
+#endif  // _LIBCPP_HAS_NO_UNICODE_CHARS
     test<short>(0);
     test<unsigned short>(0);
     test<int>(0);
diff --git a/test/language.support/support.limits/limits/numeric.limits.members/digits.pass.cpp b/test/language.support/support.limits/limits/numeric.limits.members/digits.pass.cpp
index a0a5b6176..f18426c9c 100644
--- a/test/language.support/support.limits/limits/numeric.limits.members/digits.pass.cpp
+++ b/test/language.support/support.limits/limits/numeric.limits.members/digits.pass.cpp
@@ -34,7 +34,7 @@ int main()
 #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
     test<char16_t, 16>();
     test<char32_t, 32>();
-#endif
+#endif  // _LIBCPP_HAS_NO_UNICODE_CHARS
     test<short, 15>();
     test<unsigned short, 16>();
     test<int, 31>();
diff --git a/test/language.support/support.limits/limits/numeric.limits.members/digits10.pass.cpp b/test/language.support/support.limits/limits/numeric.limits.members/digits10.pass.cpp
index 8a6bfed39..aca90a37f 100644
--- a/test/language.support/support.limits/limits/numeric.limits.members/digits10.pass.cpp
+++ b/test/language.support/support.limits/limits/numeric.limits.members/digits10.pass.cpp
@@ -38,7 +38,7 @@ int main()
 #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
     test<char16_t, 4>();
     test<char32_t, 9>();
-#endif
+#endif  // _LIBCPP_HAS_NO_UNICODE_CHARS
     test<short, 4>();
     test<unsigned short, 4>();
     test<int, 9>();
diff --git a/test/language.support/support.limits/limits/numeric.limits.members/epsilon.pass.cpp b/test/language.support/support.limits/limits/numeric.limits.members/epsilon.pass.cpp
index cc284a153..d503ddd30 100644
--- a/test/language.support/support.limits/limits/numeric.limits.members/epsilon.pass.cpp
+++ b/test/language.support/support.limits/limits/numeric.limits.members/epsilon.pass.cpp
@@ -35,7 +35,7 @@ int main()
 #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
     test<char16_t>(0);
     test<char32_t>(0);
-#endif
+#endif  // _LIBCPP_HAS_NO_UNICODE_CHARS
     test<short>(0);
     test<unsigned short>(0);
     test<int>(0);
diff --git a/test/language.support/support.limits/limits/numeric.limits.members/has_denorm.pass.cpp b/test/language.support/support.limits/limits/numeric.limits.members/has_denorm.pass.cpp
index 02bfda18c..0b7107699 100644
--- a/test/language.support/support.limits/limits/numeric.limits.members/has_denorm.pass.cpp
+++ b/test/language.support/support.limits/limits/numeric.limits.members/has_denorm.pass.cpp
@@ -33,7 +33,7 @@ int main()
 #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
     test<char16_t, std::denorm_absent>();
     test<char32_t, std::denorm_absent>();
-#endif
+#endif  // _LIBCPP_HAS_NO_UNICODE_CHARS
     test<short, std::denorm_absent>();
     test<unsigned short, std::denorm_absent>();
     test<int, std::denorm_absent>();
diff --git a/test/language.support/support.limits/limits/numeric.limits.members/has_denorm_loss.pass.cpp b/test/language.support/support.limits/limits/numeric.limits.members/has_denorm_loss.pass.cpp
index 834a478a4..3679b7c25 100644
--- a/test/language.support/support.limits/limits/numeric.limits.members/has_denorm_loss.pass.cpp
+++ b/test/language.support/support.limits/limits/numeric.limits.members/has_denorm_loss.pass.cpp
@@ -33,7 +33,7 @@ int main()
 #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
     test<char16_t, false>();
     test<char32_t, false>();
-#endif
+#endif  // _LIBCPP_HAS_NO_UNICODE_CHARS
     test<short, false>();
     test<unsigned short, false>();
     test<int, false>();
diff --git a/test/language.support/support.limits/limits/numeric.limits.members/has_infinity.pass.cpp b/test/language.support/support.limits/limits/numeric.limits.members/has_infinity.pass.cpp
index e3707495b..52f366124 100644
--- a/test/language.support/support.limits/limits/numeric.limits.members/has_infinity.pass.cpp
+++ b/test/language.support/support.limits/limits/numeric.limits.members/has_infinity.pass.cpp
@@ -33,7 +33,7 @@ int main()
 #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
     test<char16_t, false>();
     test<char32_t, false>();
-#endif
+#endif  // _LIBCPP_HAS_NO_UNICODE_CHARS
     test<short, false>();
     test<unsigned short, false>();
     test<int, false>();
diff --git a/test/language.support/support.limits/limits/numeric.limits.members/has_quiet_NaN.pass.cpp b/test/language.support/support.limits/limits/numeric.limits.members/has_quiet_NaN.pass.cpp
index 380168696..5108227de 100644
--- a/test/language.support/support.limits/limits/numeric.limits.members/has_quiet_NaN.pass.cpp
+++ b/test/language.support/support.limits/limits/numeric.limits.members/has_quiet_NaN.pass.cpp
@@ -33,7 +33,7 @@ int main()
 #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
     test<char16_t, false>();
     test<char32_t, false>();
-#endif
+#endif  // _LIBCPP_HAS_NO_UNICODE_CHARS
     test<short, false>();
     test<unsigned short, false>();
     test<int, false>();
diff --git a/test/language.support/support.limits/limits/numeric.limits.members/has_signaling_NaN.pass.cpp b/test/language.support/support.limits/limits/numeric.limits.members/has_signaling_NaN.pass.cpp
index 55f525aa4..8ffe9a0d6 100644
--- a/test/language.support/support.limits/limits/numeric.limits.members/has_signaling_NaN.pass.cpp
+++ b/test/language.support/support.limits/limits/numeric.limits.members/has_signaling_NaN.pass.cpp
@@ -33,7 +33,7 @@ int main()
 #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
     test<char16_t, false>();
     test<char32_t, false>();
-#endif
+#endif  // _LIBCPP_HAS_NO_UNICODE_CHARS
     test<short, false>();
     test<unsigned short, false>();
     test<int, false>();
diff --git a/test/language.support/support.limits/limits/numeric.limits.members/infinity.pass.cpp b/test/language.support/support.limits/limits/numeric.limits.members/infinity.pass.cpp
index 76422ab9d..55bd53b7c 100644
--- a/test/language.support/support.limits/limits/numeric.limits.members/infinity.pass.cpp
+++ b/test/language.support/support.limits/limits/numeric.limits.members/infinity.pass.cpp
@@ -37,7 +37,7 @@ int main()
 #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
     test<char16_t>(0);
     test<char32_t>(0);
-#endif
+#endif  // _LIBCPP_HAS_NO_UNICODE_CHARS
     test<short>(0);
     test<unsigned short>(0);
     test<int>(0);
diff --git a/test/language.support/support.limits/limits/numeric.limits.members/is_bounded.pass.cpp b/test/language.support/support.limits/limits/numeric.limits.members/is_bounded.pass.cpp
index ad10a8b06..86d83ac76 100644
--- a/test/language.support/support.limits/limits/numeric.limits.members/is_bounded.pass.cpp
+++ b/test/language.support/support.limits/limits/numeric.limits.members/is_bounded.pass.cpp
@@ -33,7 +33,7 @@ int main()
 #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
     test<char16_t, true>();
     test<char32_t, true>();
-#endif
+#endif  // _LIBCPP_HAS_NO_UNICODE_CHARS
     test<short, true>();
     test<unsigned short, true>();
     test<int, true>();
diff --git a/test/language.support/support.limits/limits/numeric.limits.members/is_exact.pass.cpp b/test/language.support/support.limits/limits/numeric.limits.members/is_exact.pass.cpp
index 54ac4c51b..4e38e1c87 100644
--- a/test/language.support/support.limits/limits/numeric.limits.members/is_exact.pass.cpp
+++ b/test/language.support/support.limits/limits/numeric.limits.members/is_exact.pass.cpp
@@ -33,7 +33,7 @@ int main()
 #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
     test<char16_t, true>();
     test<char32_t, true>();
-#endif
+#endif  // _LIBCPP_HAS_NO_UNICODE_CHARS
     test<short, true>();
     test<unsigned short, true>();
     test<int, true>();
diff --git a/test/language.support/support.limits/limits/numeric.limits.members/is_iec559.pass.cpp b/test/language.support/support.limits/limits/numeric.limits.members/is_iec559.pass.cpp
index 04a46fa0b..df187a913 100644
--- a/test/language.support/support.limits/limits/numeric.limits.members/is_iec559.pass.cpp
+++ b/test/language.support/support.limits/limits/numeric.limits.members/is_iec559.pass.cpp
@@ -33,7 +33,7 @@ int main()
 #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
     test<char16_t, false>();
     test<char32_t, false>();
-#endif
+#endif  // _LIBCPP_HAS_NO_UNICODE_CHARS
     test<short, false>();
     test<unsigned short, false>();
     test<int, false>();
diff --git a/test/language.support/support.limits/limits/numeric.limits.members/is_integer.pass.cpp b/test/language.support/support.limits/limits/numeric.limits.members/is_integer.pass.cpp
index bba2351e5..a24f8b026 100644
--- a/test/language.support/support.limits/limits/numeric.limits.members/is_integer.pass.cpp
+++ b/test/language.support/support.limits/limits/numeric.limits.members/is_integer.pass.cpp
@@ -33,7 +33,7 @@ int main()
 #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
     test<char16_t, true>();
     test<char32_t, true>();
-#endif
+#endif  // _LIBCPP_HAS_NO_UNICODE_CHARS
     test<short, true>();
     test<unsigned short, true>();
     test<int, true>();
diff --git a/test/language.support/support.limits/limits/numeric.limits.members/is_modulo.pass.cpp b/test/language.support/support.limits/limits/numeric.limits.members/is_modulo.pass.cpp
index 0f410b892..f1fb8b8fc 100644
--- a/test/language.support/support.limits/limits/numeric.limits.members/is_modulo.pass.cpp
+++ b/test/language.support/support.limits/limits/numeric.limits.members/is_modulo.pass.cpp
@@ -33,7 +33,7 @@ int main()
 #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
     test<char16_t, true>();
     test<char32_t, true>();
-#endif
+#endif  // _LIBCPP_HAS_NO_UNICODE_CHARS
     test<short, true>();
     test<unsigned short, true>();
     test<int, true>();
diff --git a/test/language.support/support.limits/limits/numeric.limits.members/is_signed.pass.cpp b/test/language.support/support.limits/limits/numeric.limits.members/is_signed.pass.cpp
index e0895c53a..3d97ea922 100644
--- a/test/language.support/support.limits/limits/numeric.limits.members/is_signed.pass.cpp
+++ b/test/language.support/support.limits/limits/numeric.limits.members/is_signed.pass.cpp
@@ -33,7 +33,7 @@ int main()
 #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
     test<char16_t, false>();
     test<char32_t, false>();
-#endif
+#endif  // _LIBCPP_HAS_NO_UNICODE_CHARS
     test<short, true>();
     test<unsigned short, false>();
     test<int, true>();
diff --git a/test/language.support/support.limits/limits/numeric.limits.members/lowest.pass.cpp b/test/language.support/support.limits/limits/numeric.limits.members/lowest.pass.cpp
index c53e4a54c..964b43c92 100644
--- a/test/language.support/support.limits/limits/numeric.limits.members/lowest.pass.cpp
+++ b/test/language.support/support.limits/limits/numeric.limits.members/lowest.pass.cpp
@@ -41,7 +41,7 @@ int main()
 #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
     test<char16_t>(0);
     test<char32_t>(0);
-#endif
+#endif  // _LIBCPP_HAS_NO_UNICODE_CHARS
     test<short>(SHRT_MIN);
     test<unsigned short>(0);
     test<int>(INT_MIN);
diff --git a/test/language.support/support.limits/limits/numeric.limits.members/max.pass.cpp b/test/language.support/support.limits/limits/numeric.limits.members/max.pass.cpp
index f42d888ea..c4487ee43 100644
--- a/test/language.support/support.limits/limits/numeric.limits.members/max.pass.cpp
+++ b/test/language.support/support.limits/limits/numeric.limits.members/max.pass.cpp
@@ -41,7 +41,7 @@ int main()
 #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
     test<char16_t>(USHRT_MAX);
     test<char32_t>(UINT_MAX);
-#endif
+#endif  // _LIBCPP_HAS_NO_UNICODE_CHARS
     test<short>(SHRT_MAX);
     test<unsigned short>(USHRT_MAX);
     test<int>(INT_MAX);
diff --git a/test/language.support/support.limits/limits/numeric.limits.members/max_digits10.pass.cpp b/test/language.support/support.limits/limits/numeric.limits.members/max_digits10.pass.cpp
index 5b1cc0538..cff85fb2b 100644
--- a/test/language.support/support.limits/limits/numeric.limits.members/max_digits10.pass.cpp
+++ b/test/language.support/support.limits/limits/numeric.limits.members/max_digits10.pass.cpp
@@ -34,7 +34,7 @@ int main()
 #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
     test<char16_t, 0>();
     test<char32_t, 0>();
-#endif
+#endif  // _LIBCPP_HAS_NO_UNICODE_CHARS
     test<short, 0>();
     test<unsigned short, 0>();
     test<int, 0>();
diff --git a/test/language.support/support.limits/limits/numeric.limits.members/max_exponent.pass.cpp b/test/language.support/support.limits/limits/numeric.limits.members/max_exponent.pass.cpp
index 33fbc5154..fdc179c79 100644
--- a/test/language.support/support.limits/limits/numeric.limits.members/max_exponent.pass.cpp
+++ b/test/language.support/support.limits/limits/numeric.limits.members/max_exponent.pass.cpp
@@ -34,7 +34,7 @@ int main()
 #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
     test<char16_t, 0>();
     test<char32_t, 0>();
-#endif
+#endif  // _LIBCPP_HAS_NO_UNICODE_CHARS
     test<short, 0>();
     test<unsigned short, 0>();
     test<int, 0>();
diff --git a/test/language.support/support.limits/limits/numeric.limits.members/max_exponent10.pass.cpp b/test/language.support/support.limits/limits/numeric.limits.members/max_exponent10.pass.cpp
index 6f2d4c3eb..f4c1d02ec 100644
--- a/test/language.support/support.limits/limits/numeric.limits.members/max_exponent10.pass.cpp
+++ b/test/language.support/support.limits/limits/numeric.limits.members/max_exponent10.pass.cpp
@@ -34,7 +34,7 @@ int main()
 #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
     test<char16_t, 0>();
     test<char32_t, 0>();
-#endif
+#endif  // _LIBCPP_HAS_NO_UNICODE_CHARS
     test<short, 0>();
     test<unsigned short, 0>();
     test<int, 0>();
diff --git a/test/language.support/support.limits/limits/numeric.limits.members/min.pass.cpp b/test/language.support/support.limits/limits/numeric.limits.members/min.pass.cpp
index 008430044..d14112379 100644
--- a/test/language.support/support.limits/limits/numeric.limits.members/min.pass.cpp
+++ b/test/language.support/support.limits/limits/numeric.limits.members/min.pass.cpp
@@ -41,7 +41,7 @@ int main()
 #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
     test<char16_t>(0);
     test<char32_t>(0);
-#endif
+#endif  // _LIBCPP_HAS_NO_UNICODE_CHARS
     test<short>(SHRT_MIN);
     test<unsigned short>(0);
     test<int>(INT_MIN);
diff --git a/test/language.support/support.limits/limits/numeric.limits.members/min_exponent.pass.cpp b/test/language.support/support.limits/limits/numeric.limits.members/min_exponent.pass.cpp
index c349a3c68..74be7614a 100644
--- a/test/language.support/support.limits/limits/numeric.limits.members/min_exponent.pass.cpp
+++ b/test/language.support/support.limits/limits/numeric.limits.members/min_exponent.pass.cpp
@@ -34,7 +34,7 @@ int main()
 #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
     test<char16_t, 0>();
     test<char32_t, 0>();
-#endif
+#endif  // _LIBCPP_HAS_NO_UNICODE_CHARS
     test<short, 0>();
     test<unsigned short, 0>();
     test<int, 0>();
diff --git a/test/language.support/support.limits/limits/numeric.limits.members/min_exponent10.pass.cpp b/test/language.support/support.limits/limits/numeric.limits.members/min_exponent10.pass.cpp
index 329155cf5..97926e32b 100644
--- a/test/language.support/support.limits/limits/numeric.limits.members/min_exponent10.pass.cpp
+++ b/test/language.support/support.limits/limits/numeric.limits.members/min_exponent10.pass.cpp
@@ -34,7 +34,7 @@ int main()
 #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
     test<char16_t, 0>();
     test<char32_t, 0>();
-#endif
+#endif  // _LIBCPP_HAS_NO_UNICODE_CHARS
     test<short, 0>();
     test<unsigned short, 0>();
     test<int, 0>();
diff --git a/test/language.support/support.limits/limits/numeric.limits.members/quiet_NaN.pass.cpp b/test/language.support/support.limits/limits/numeric.limits.members/quiet_NaN.pass.cpp
index f20d706fc..c82aa4731 100644
--- a/test/language.support/support.limits/limits/numeric.limits.members/quiet_NaN.pass.cpp
+++ b/test/language.support/support.limits/limits/numeric.limits.members/quiet_NaN.pass.cpp
@@ -54,7 +54,7 @@ int main()
 #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
     test<char16_t>();
     test<char32_t>();
-#endif
+#endif  // _LIBCPP_HAS_NO_UNICODE_CHARS
     test<short>();
     test<unsigned short>();
     test<int>();
diff --git a/test/language.support/support.limits/limits/numeric.limits.members/radix.pass.cpp b/test/language.support/support.limits/limits/numeric.limits.members/radix.pass.cpp
index 67b22d60e..5f2c6ff60 100644
--- a/test/language.support/support.limits/limits/numeric.limits.members/radix.pass.cpp
+++ b/test/language.support/support.limits/limits/numeric.limits.members/radix.pass.cpp
@@ -34,7 +34,7 @@ int main()
 #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
     test<char16_t, 2>();
     test<char32_t, 2>();
-#endif
+#endif  // _LIBCPP_HAS_NO_UNICODE_CHARS
     test<short, 2>();
     test<unsigned short, 2>();
     test<int, 2>();
diff --git a/test/language.support/support.limits/limits/numeric.limits.members/round_error.pass.cpp b/test/language.support/support.limits/limits/numeric.limits.members/round_error.pass.cpp
index fb5aa0498..0cc88d3b7 100644
--- a/test/language.support/support.limits/limits/numeric.limits.members/round_error.pass.cpp
+++ b/test/language.support/support.limits/limits/numeric.limits.members/round_error.pass.cpp
@@ -35,7 +35,7 @@ int main()
 #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
     test<char16_t>(0);
     test<char32_t>(0);
-#endif
+#endif  // _LIBCPP_HAS_NO_UNICODE_CHARS
     test<short>(0);
     test<unsigned short>(0);
     test<int>(0);
diff --git a/test/language.support/support.limits/limits/numeric.limits.members/round_style.pass.cpp b/test/language.support/support.limits/limits/numeric.limits.members/round_style.pass.cpp
index 1922567fc..ed6097f5f 100644
--- a/test/language.support/support.limits/limits/numeric.limits.members/round_style.pass.cpp
+++ b/test/language.support/support.limits/limits/numeric.limits.members/round_style.pass.cpp
@@ -33,7 +33,7 @@ int main()
 #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
     test<char16_t, std::round_toward_zero>();
     test<char32_t, std::round_toward_zero>();
-#endif
+#endif  // _LIBCPP_HAS_NO_UNICODE_CHARS
     test<short, std::round_toward_zero>();
     test<unsigned short, std::round_toward_zero>();
     test<int, std::round_toward_zero>();
diff --git a/test/language.support/support.limits/limits/numeric.limits.members/signaling_NaN.pass.cpp b/test/language.support/support.limits/limits/numeric.limits.members/signaling_NaN.pass.cpp
index 67a63d3b0..1d559cb29 100644
--- a/test/language.support/support.limits/limits/numeric.limits.members/signaling_NaN.pass.cpp
+++ b/test/language.support/support.limits/limits/numeric.limits.members/signaling_NaN.pass.cpp
@@ -54,7 +54,7 @@ int main()
 #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
     test<char16_t>();
     test<char32_t>();
-#endif
+#endif  // _LIBCPP_HAS_NO_UNICODE_CHARS
     test<short>();
     test<unsigned short>();
     test<int>();
diff --git a/test/language.support/support.limits/limits/numeric.limits.members/tinyness_before.pass.cpp b/test/language.support/support.limits/limits/numeric.limits.members/tinyness_before.pass.cpp
index ec591ebc9..f5fb44ce8 100644
--- a/test/language.support/support.limits/limits/numeric.limits.members/tinyness_before.pass.cpp
+++ b/test/language.support/support.limits/limits/numeric.limits.members/tinyness_before.pass.cpp
@@ -33,7 +33,7 @@ int main()
 #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
     test<char16_t, false>();
     test<char32_t, false>();
-#endif
+#endif  // _LIBCPP_HAS_NO_UNICODE_CHARS
     test<short, false>();
     test<unsigned short, false>();
     test<int, false>();
diff --git a/test/language.support/support.limits/limits/numeric.limits.members/traps.pass.cpp b/test/language.support/support.limits/limits/numeric.limits.members/traps.pass.cpp
index 5a9f51fba..b855c4f91 100644
--- a/test/language.support/support.limits/limits/numeric.limits.members/traps.pass.cpp
+++ b/test/language.support/support.limits/limits/numeric.limits.members/traps.pass.cpp
@@ -33,7 +33,7 @@ int main()
 #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
     test<char16_t, true>();
     test<char32_t, true>();
-#endif
+#endif  // _LIBCPP_HAS_NO_UNICODE_CHARS
     test<short, true>();
     test<unsigned short, true>();
     test<int, true>();
diff --git a/test/language.support/support.types/nullptr_t.pass.cpp b/test/language.support/support.types/nullptr_t.pass.cpp
index 204d740c3..e1cbfe391 100644
--- a/test/language.support/support.types/nullptr_t.pass.cpp
+++ b/test/language.support/support.types/nullptr_t.pass.cpp
@@ -29,7 +29,7 @@ int main()
     // GCC 4.2 through 4.5 can't handle this
     void (A::*pmf)() = 0;
     assert(pmf == nullptr);
-#endif
+#endif  // !((__GNUC__ < 4) || (__GNUC__ == 4 && __GNUC_MINOR__ <= 5))
     int A::*pmd = 0;
     assert(pmd == nullptr);
     A a1(nullptr);