diff --git a/libcxx/test/libcxx/algorithms/callable.verify.cpp b/libcxx/test/libcxx/algorithms/callable.verify.cpp
index a20049b8271c..da87ecd0971d 100644
--- a/libcxx/test/libcxx/algorithms/callable.verify.cpp
+++ b/libcxx/test/libcxx/algorithms/callable.verify.cpp
@@ -14,7 +14,7 @@
 
 #include <algorithm>
 
-int main() {
+void f() {
   struct S {
     int i;
 
diff --git a/libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.remove_all/toctou.pass.cpp b/libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.remove_all/toctou.pass.cpp
index 387044777d1b..883191253206 100644
--- a/libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.remove_all/toctou.pass.cpp
+++ b/libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.remove_all/toctou.pass.cpp
@@ -44,7 +44,7 @@
 #include "filesystem_include.h"
 #include "filesystem_test_helper.h"
 
-int main() {
+int main(int, char**) {
   scoped_test_env env;
   fs::path const tmpdir = env.create_dir("mydir");
   fs::path const victim_del_path = tmpdir / "victim_del";
diff --git a/libcxx/test/std/input.output/iostream.format/output.streams/ostream/deleted_output_functions.verify.cpp b/libcxx/test/std/input.output/iostream.format/output.streams/ostream/deleted_output_functions.verify.cpp
index b0946a6adc56..d8d2a94791b3 100644
--- a/libcxx/test/std/input.output/iostream.format/output.streams/ostream/deleted_output_functions.verify.cpp
+++ b/libcxx/test/std/input.output/iostream.format/output.streams/ostream/deleted_output_functions.verify.cpp
@@ -16,7 +16,7 @@
 
 #include "test_macros.h"
 
-int main() {
+void f() {
   std::ostringstream s;
 
 #ifndef TEST_HAS_NO_WIDE_CHARACTERS
diff --git a/libcxx/test/std/strings/basic.string/string.capacity/shrink_to_fit.explicit_instantiation.sh.cpp b/libcxx/test/std/strings/basic.string/string.capacity/shrink_to_fit.explicit_instantiation.sh.cpp
index bf27795154bc..195491f45045 100644
--- a/libcxx/test/std/strings/basic.string/string.capacity/shrink_to_fit.explicit_instantiation.sh.cpp
+++ b/libcxx/test/std/strings/basic.string/string.capacity/shrink_to_fit.explicit_instantiation.sh.cpp
@@ -52,7 +52,7 @@ template class std::basic_string<char16, string16_char_traits>;
 #else
 extern template class std::basic_string<char16, string16_char_traits>;
 
-int main() {
+int main(int, char**) {
     std::basic_string<char16, string16_char_traits> s;
     s.shrink_to_fit();
 }
diff --git a/libcxx/test/std/utilities/utility/pairs/pairs.pair/assign_const_copy_convert.pass.cpp b/libcxx/test/std/utilities/utility/pairs/pairs.pair/assign_const_copy_convert.pass.cpp
index 45f92994b1b4..13059ca3a2da 100644
--- a/libcxx/test/std/utilities/utility/pairs/pairs.pair/assign_const_copy_convert.pass.cpp
+++ b/libcxx/test/std/utilities/utility/pairs/pairs.pair/assign_const_copy_convert.pass.cpp
@@ -78,7 +78,7 @@ constexpr bool test() {
   return true;
 }
 
-int main(int, const char**) {
+int main(int, char**) {
   test();
 // gcc cannot have mutable member in constant expression
 #if !defined(TEST_COMPILER_GCC)
diff --git a/libcxx/test/std/utilities/utility/pairs/pairs.pair/assign_const_copy_pair.pass.cpp b/libcxx/test/std/utilities/utility/pairs/pairs.pair/assign_const_copy_pair.pass.cpp
index ac966fc8c21d..52468bd67444 100644
--- a/libcxx/test/std/utilities/utility/pairs/pairs.pair/assign_const_copy_pair.pass.cpp
+++ b/libcxx/test/std/utilities/utility/pairs/pairs.pair/assign_const_copy_pair.pass.cpp
@@ -75,7 +75,7 @@ constexpr bool test() {
   return true;
 }
 
-int main(int, const char**) {
+int main(int, char**) {
   test();
 // gcc cannot have mutable member in constant expression
 #if !defined(TEST_COMPILER_GCC)
diff --git a/libcxx/test/std/utilities/utility/pairs/pairs.pair/assign_const_move_convert.pass.cpp b/libcxx/test/std/utilities/utility/pairs/pairs.pair/assign_const_move_convert.pass.cpp
index e8fbd9e6714c..ee3804dba873 100644
--- a/libcxx/test/std/utilities/utility/pairs/pairs.pair/assign_const_move_convert.pass.cpp
+++ b/libcxx/test/std/utilities/utility/pairs/pairs.pair/assign_const_move_convert.pass.cpp
@@ -78,7 +78,7 @@ constexpr bool test() {
   return true;
 }
 
-int main(int, const char**) {
+int main(int, char**) {
   test();
 // gcc cannot have mutable member in constant expression
 #if !defined(TEST_COMPILER_GCC)
diff --git a/libcxx/test/std/utilities/utility/pairs/pairs.pair/assign_const_move_pair.pass.cpp b/libcxx/test/std/utilities/utility/pairs/pairs.pair/assign_const_move_pair.pass.cpp
index 8f7c8635a811..585d2aac0f27 100644
--- a/libcxx/test/std/utilities/utility/pairs/pairs.pair/assign_const_move_pair.pass.cpp
+++ b/libcxx/test/std/utilities/utility/pairs/pairs.pair/assign_const_move_pair.pass.cpp
@@ -75,7 +75,7 @@ constexpr bool test() {
   return true;
 }
 
-int main(int, const char**) {
+int main(int, char**) {
   test();
 // gcc cannot have mutable member in constant expression
 #if !defined(TEST_COMPILER_GCC)