diff --git a/test/std/input.output/filesystems/fs.enum/check_bitmask_types.hpp b/test/std/input.output/filesystems/fs.enum/check_bitmask_types.h
similarity index 96%
rename from test/std/input.output/filesystems/fs.enum/check_bitmask_types.hpp
rename to test/std/input.output/filesystems/fs.enum/check_bitmask_types.h
index 77b136f..d95378d 100644
--- a/test/std/input.output/filesystems/fs.enum/check_bitmask_types.hpp
+++ b/test/std/input.output/filesystems/fs.enum/check_bitmask_types.h
@@ -1,5 +1,5 @@
-#ifndef TEST_BITMASK_TYPE_HPP
-#define TEST_BITMASK_TYPE_HPP
+#ifndef TEST_BITMASK_TYPE_H
+#define TEST_BITMASK_TYPE_H
 
 #include <type_traits>
 #include <cassert>
diff --git a/test/std/input.output/filesystems/fs.enum/enum.copy_options.pass.cpp b/test/std/input.output/filesystems/fs.enum/enum.copy_options.pass.cpp
index 7bc129f..df83d4e 100644
--- a/test/std/input.output/filesystems/fs.enum/enum.copy_options.pass.cpp
+++ b/test/std/input.output/filesystems/fs.enum/enum.copy_options.pass.cpp
@@ -16,7 +16,7 @@
 #include <type_traits>
 #include <cassert>
 
-#include "check_bitmask_types.hpp"
+#include "check_bitmask_types.h"
 #include "test_macros.h"
 
 
diff --git a/test/std/input.output/filesystems/fs.enum/enum.directory_options.pass.cpp b/test/std/input.output/filesystems/fs.enum/enum.directory_options.pass.cpp
index 44e1c63..cd5c5e8 100644
--- a/test/std/input.output/filesystems/fs.enum/enum.directory_options.pass.cpp
+++ b/test/std/input.output/filesystems/fs.enum/enum.directory_options.pass.cpp
@@ -18,7 +18,7 @@
 #include <sys/stat.h>
 
 #include "test_macros.h"
-#include "check_bitmask_types.hpp"
+#include "check_bitmask_types.h"
 
 
 constexpr fs::directory_options ME(int val) { return static_cast<fs::directory_options>(val); }
diff --git a/test/std/input.output/filesystems/fs.enum/enum.perm_options.pass.cpp b/test/std/input.output/filesystems/fs.enum/enum.perm_options.pass.cpp
index 41fb731..138ebd0 100644
--- a/test/std/input.output/filesystems/fs.enum/enum.perm_options.pass.cpp
+++ b/test/std/input.output/filesystems/fs.enum/enum.perm_options.pass.cpp
@@ -18,7 +18,7 @@
 #include <sys/stat.h>
 
 #include "test_macros.h"
-#include "check_bitmask_types.hpp"
+#include "check_bitmask_types.h"
 
 
 constexpr fs::perm_options ME(int val) {
diff --git a/test/std/input.output/filesystems/fs.enum/enum.perms.pass.cpp b/test/std/input.output/filesystems/fs.enum/enum.perms.pass.cpp
index a9613f2..ae0e49b 100644
--- a/test/std/input.output/filesystems/fs.enum/enum.perms.pass.cpp
+++ b/test/std/input.output/filesystems/fs.enum/enum.perms.pass.cpp
@@ -18,7 +18,7 @@
 #include <sys/stat.h>
 
 #include "test_macros.h"
-#include "check_bitmask_types.hpp"
+#include "check_bitmask_types.h"
 
 
 constexpr fs::perms ME(int val) { return static_cast<fs::perms>(val); }
diff --git a/test/std/utilities/function.objects/comparisons/greater.pass.cpp b/test/std/utilities/function.objects/comparisons/greater.pass.cpp
index 35c0575..b1f1fe6 100644
--- a/test/std/utilities/function.objects/comparisons/greater.pass.cpp
+++ b/test/std/utilities/function.objects/comparisons/greater.pass.cpp
@@ -15,7 +15,7 @@
 #include <cassert>
 
 #include "test_macros.h"
-#include "pointer_comparison_test_helper.hpp"
+#include "pointer_comparison_test_helper.h"
 
 int main(int, char**)
 {
diff --git a/test/std/utilities/function.objects/comparisons/greater_equal.pass.cpp b/test/std/utilities/function.objects/comparisons/greater_equal.pass.cpp
index 9a6d36c..30cf7e0 100644
--- a/test/std/utilities/function.objects/comparisons/greater_equal.pass.cpp
+++ b/test/std/utilities/function.objects/comparisons/greater_equal.pass.cpp
@@ -15,7 +15,7 @@
 #include <cassert>
 
 #include "test_macros.h"
-#include "pointer_comparison_test_helper.hpp"
+#include "pointer_comparison_test_helper.h"
 
 int main(int, char**)
 {
diff --git a/test/std/utilities/function.objects/comparisons/less.pass.cpp b/test/std/utilities/function.objects/comparisons/less.pass.cpp
index 31a2f97..88b7c78 100644
--- a/test/std/utilities/function.objects/comparisons/less.pass.cpp
+++ b/test/std/utilities/function.objects/comparisons/less.pass.cpp
@@ -15,7 +15,7 @@
 #include <cassert>
 
 #include "test_macros.h"
-#include "pointer_comparison_test_helper.hpp"
+#include "pointer_comparison_test_helper.h"
 
 int main(int, char**)
 {
diff --git a/test/std/utilities/function.objects/comparisons/less_equal.pass.cpp b/test/std/utilities/function.objects/comparisons/less_equal.pass.cpp
index 31cbed1..5aa6d79 100644
--- a/test/std/utilities/function.objects/comparisons/less_equal.pass.cpp
+++ b/test/std/utilities/function.objects/comparisons/less_equal.pass.cpp
@@ -15,7 +15,7 @@
 #include <cassert>
 
 #include "test_macros.h"
-#include "pointer_comparison_test_helper.hpp"
+#include "pointer_comparison_test_helper.h"
 
 int main(int, char**)
 {
diff --git a/test/std/utilities/function.objects/comparisons/pointer_comparison_test_helper.hpp b/test/std/utilities/function.objects/comparisons/pointer_comparison_test_helper.h
similarity index 89%
rename from test/std/utilities/function.objects/comparisons/pointer_comparison_test_helper.hpp
rename to test/std/utilities/function.objects/comparisons/pointer_comparison_test_helper.h
index b23d4e8..ac4df55 100644
--- a/test/std/utilities/function.objects/comparisons/pointer_comparison_test_helper.hpp
+++ b/test/std/utilities/function.objects/comparisons/pointer_comparison_test_helper.h
@@ -1,5 +1,5 @@
-#ifndef POINTER_COMPARISON_TEST_HELPER_HPP
-#define POINTER_COMPARISON_TEST_HELPER_HPP
+#ifndef POINTER_COMPARISON_TEST_HELPER_H
+#define POINTER_COMPARISON_TEST_HELPER_H
 
 #include <vector>
 #include <memory>
@@ -36,4 +36,4 @@
     }
 }
 
-#endif // POINTER_COMPARISON_TEST_HELPER_HPP
+#endif // POINTER_COMPARISON_TEST_HELPER_H