diff --git a/libcxx/test/std/numerics/numbers/defined.pass.cpp b/libcxx/test/std/numerics/numbers/defined.pass.cpp
index 5b91c19cb0a171..ca5fdd049593d8 100644
--- a/libcxx/test/std/numerics/numbers/defined.pass.cpp
+++ b/libcxx/test/std/numerics/numbers/defined.pass.cpp
@@ -11,67 +11,62 @@
 
 #include <numbers>
 
-// We are testing if these are defined by taking an address. Don't care if the result is unused.
-#if defined(__clang__)
-#   pragma clang diagnostic ignored "-Wunused-variable"
-#endif
-
 constexpr bool tests() {
-  const double* dd0{&std::numbers::e};
-  const double* dd1{&std::numbers::log2e};
-  const double* dd2{&std::numbers::log10e};
-  const double* dd3{&std::numbers::pi};
-  const double* dd4{&std::numbers::inv_pi};
-  const double* dd5{&std::numbers::inv_sqrtpi};
-  const double* dd6{&std::numbers::ln2};
-  const double* dd7{&std::numbers::ln10};
-  const double* dd8{&std::numbers::sqrt2};
-  const double* dd9{&std::numbers::sqrt3};
-  const double* dd10{&std::numbers::inv_sqrt3};
-  const double* dd11{&std::numbers::egamma};
-  const double* dd12{&std::numbers::phi};
+  [[maybe_unused]] const double* dd0{&std::numbers::e};
+  [[maybe_unused]] const double* dd1{&std::numbers::log2e};
+  [[maybe_unused]] const double* dd2{&std::numbers::log10e};
+  [[maybe_unused]] const double* dd3{&std::numbers::pi};
+  [[maybe_unused]] const double* dd4{&std::numbers::inv_pi};
+  [[maybe_unused]] const double* dd5{&std::numbers::inv_sqrtpi};
+  [[maybe_unused]] const double* dd6{&std::numbers::ln2};
+  [[maybe_unused]] const double* dd7{&std::numbers::ln10};
+  [[maybe_unused]] const double* dd8{&std::numbers::sqrt2};
+  [[maybe_unused]] const double* dd9{&std::numbers::sqrt3};
+  [[maybe_unused]] const double* dd10{&std::numbers::inv_sqrt3};
+  [[maybe_unused]] const double* dd11{&std::numbers::egamma};
+  [[maybe_unused]] const double* dd12{&std::numbers::phi};
 
-  const float* f0{&std::numbers::e_v<float>};
-  const float* f1{&std::numbers::log2e_v<float>};
-  const float* f2{&std::numbers::log10e_v<float>};
-  const float* f3{&std::numbers::pi_v<float>};
-  const float* f4{&std::numbers::inv_pi_v<float>};
-  const float* f5{&std::numbers::inv_sqrtpi_v<float>};
-  const float* f6{&std::numbers::ln2_v<float>};
-  const float* f7{&std::numbers::ln10_v<float>};
-  const float* f8{&std::numbers::sqrt2_v<float>};
-  const float* f9{&std::numbers::sqrt3_v<float>};
-  const float* f10{&std::numbers::inv_sqrt3_v<float>};
-  const float* f11{&std::numbers::egamma_v<float>};
-  const float* f12{&std::numbers::phi_v<float>};
+  [[maybe_unused]] const float* f0{&std::numbers::e_v<float>};
+  [[maybe_unused]] const float* f1{&std::numbers::log2e_v<float>};
+  [[maybe_unused]] const float* f2{&std::numbers::log10e_v<float>};
+  [[maybe_unused]] const float* f3{&std::numbers::pi_v<float>};
+  [[maybe_unused]] const float* f4{&std::numbers::inv_pi_v<float>};
+  [[maybe_unused]] const float* f5{&std::numbers::inv_sqrtpi_v<float>};
+  [[maybe_unused]] const float* f6{&std::numbers::ln2_v<float>};
+  [[maybe_unused]] const float* f7{&std::numbers::ln10_v<float>};
+  [[maybe_unused]] const float* f8{&std::numbers::sqrt2_v<float>};
+  [[maybe_unused]] const float* f9{&std::numbers::sqrt3_v<float>};
+  [[maybe_unused]] const float* f10{&std::numbers::inv_sqrt3_v<float>};
+  [[maybe_unused]] const float* f11{&std::numbers::egamma_v<float>};
+  [[maybe_unused]] const float* f12{&std::numbers::phi_v<float>};
 
-  const double* d0{&std::numbers::e_v<double>};
-  const double* d1{&std::numbers::log2e_v<double>};
-  const double* d2{&std::numbers::log10e_v<double>};
-  const double* d3{&std::numbers::pi_v<double>};
-  const double* d4{&std::numbers::inv_pi_v<double>};
-  const double* d5{&std::numbers::inv_sqrtpi_v<double>};
-  const double* d6{&std::numbers::ln2_v<double>};
-  const double* d7{&std::numbers::ln10_v<double>};
-  const double* d8{&std::numbers::sqrt2_v<double>};
-  const double* d9{&std::numbers::sqrt3_v<double>};
-  const double* d10{&std::numbers::inv_sqrt3_v<double>};
-  const double* d11{&std::numbers::egamma_v<double>};
-  const double* d12{&std::numbers::phi_v<double>};
+  [[maybe_unused]] const double* d0{&std::numbers::e_v<double>};
+  [[maybe_unused]] const double* d1{&std::numbers::log2e_v<double>};
+  [[maybe_unused]] const double* d2{&std::numbers::log10e_v<double>};
+  [[maybe_unused]] const double* d3{&std::numbers::pi_v<double>};
+  [[maybe_unused]] const double* d4{&std::numbers::inv_pi_v<double>};
+  [[maybe_unused]] const double* d5{&std::numbers::inv_sqrtpi_v<double>};
+  [[maybe_unused]] const double* d6{&std::numbers::ln2_v<double>};
+  [[maybe_unused]] const double* d7{&std::numbers::ln10_v<double>};
+  [[maybe_unused]] const double* d8{&std::numbers::sqrt2_v<double>};
+  [[maybe_unused]] const double* d9{&std::numbers::sqrt3_v<double>};
+  [[maybe_unused]] const double* d10{&std::numbers::inv_sqrt3_v<double>};
+  [[maybe_unused]] const double* d11{&std::numbers::egamma_v<double>};
+  [[maybe_unused]] const double* d12{&std::numbers::phi_v<double>};
 
-  const long double* ld0{&std::numbers::e_v<long double>};
-  const long double* ld1{&std::numbers::log2e_v<long double>};
-  const long double* ld2{&std::numbers::log10e_v<long double>};
-  const long double* ld3{&std::numbers::pi_v<long double>};
-  const long double* ld4{&std::numbers::inv_pi_v<long double>};
-  const long double* ld5{&std::numbers::inv_sqrtpi_v<long double>};
-  const long double* ld6{&std::numbers::ln2_v<long double>};
-  const long double* ld7{&std::numbers::ln10_v<long double>};
-  const long double* ld8{&std::numbers::sqrt2_v<long double>};
-  const long double* ld9{&std::numbers::sqrt3_v<long double>};
-  const long double* ld10{&std::numbers::inv_sqrt3_v<long double>};
-  const long double* ld11{&std::numbers::egamma_v<long double>};
-  const long double* ld12{&std::numbers::phi_v<long double>};
+  [[maybe_unused]] const long double* ld0{&std::numbers::e_v<long double>};
+  [[maybe_unused]] const long double* ld1{&std::numbers::log2e_v<long double>};
+  [[maybe_unused]] const long double* ld2{&std::numbers::log10e_v<long double>};
+  [[maybe_unused]] const long double* ld3{&std::numbers::pi_v<long double>};
+  [[maybe_unused]] const long double* ld4{&std::numbers::inv_pi_v<long double>};
+  [[maybe_unused]] const long double* ld5{&std::numbers::inv_sqrtpi_v<long double>};
+  [[maybe_unused]] const long double* ld6{&std::numbers::ln2_v<long double>};
+  [[maybe_unused]] const long double* ld7{&std::numbers::ln10_v<long double>};
+  [[maybe_unused]] const long double* ld8{&std::numbers::sqrt2_v<long double>};
+  [[maybe_unused]] const long double* ld9{&std::numbers::sqrt3_v<long double>};
+  [[maybe_unused]] const long double* ld10{&std::numbers::inv_sqrt3_v<long double>};
+  [[maybe_unused]] const long double* ld11{&std::numbers::egamma_v<long double>};
+  [[maybe_unused]] const long double* ld12{&std::numbers::phi_v<long double>};
 
   return true;
 }
diff --git a/libcxx/test/std/numerics/numbers/specialize.pass.cpp b/libcxx/test/std/numerics/numbers/specialize.pass.cpp
index 8c956b6cbf5a0f..e61cfa8ac6bcb4 100644
--- a/libcxx/test/std/numerics/numbers/specialize.pass.cpp
+++ b/libcxx/test/std/numerics/numbers/specialize.pass.cpp
@@ -12,25 +12,20 @@
 #include <cassert>
 #include <numbers>
 
-// We are testing if template instantiation works. Don't care if the result is unused.
-#if defined(__clang__)
-#   pragma clang diagnostic ignored "-Wunused-variable"
-#endif
-
 constexpr bool tests() {
-  float f0{std::numbers::e_v<float>};
-  float f1{std::numbers::log2e_v<float>};
-  float f2{std::numbers::log10e_v<float>};
-  float f3{std::numbers::pi_v<float>};
-  float f4{std::numbers::inv_pi_v<float>};
-  float f5{std::numbers::inv_sqrtpi_v<float>};
-  float f6{std::numbers::ln2_v<float>};
-  float f7{std::numbers::ln10_v<float>};
-  float f8{std::numbers::sqrt2_v<float>};
-  float f9{std::numbers::sqrt3_v<float>};
-  float f10{std::numbers::inv_sqrt3_v<float>};
-  float f11{std::numbers::egamma_v<float>};
-  float f12{std::numbers::phi_v<float>};
+  [[maybe_unused]] float f0{std::numbers::e_v<float>};
+  [[maybe_unused]] float f1{std::numbers::log2e_v<float>};
+  [[maybe_unused]] float f2{std::numbers::log10e_v<float>};
+  [[maybe_unused]] float f3{std::numbers::pi_v<float>};
+  [[maybe_unused]] float f4{std::numbers::inv_pi_v<float>};
+  [[maybe_unused]] float f5{std::numbers::inv_sqrtpi_v<float>};
+  [[maybe_unused]] float f6{std::numbers::ln2_v<float>};
+  [[maybe_unused]] float f7{std::numbers::ln10_v<float>};
+  [[maybe_unused]] float f8{std::numbers::sqrt2_v<float>};
+  [[maybe_unused]] float f9{std::numbers::sqrt3_v<float>};
+  [[maybe_unused]] float f10{std::numbers::inv_sqrt3_v<float>};
+  [[maybe_unused]] float f11{std::numbers::egamma_v<float>};
+  [[maybe_unused]] float f12{std::numbers::phi_v<float>};
 
   double d0{std::numbers::e_v<double>};
   double d1{std::numbers::log2e_v<double>};
@@ -60,19 +55,19 @@ constexpr bool tests() {
   assert(d11 == std::numbers::egamma);
   assert(d12 == std::numbers::phi);
 
-  long double ld0{std::numbers::e_v<long double>};
-  long double ld1{std::numbers::log2e_v<long double>};
-  long double ld2{std::numbers::log10e_v<long double>};
-  long double ld3{std::numbers::pi_v<long double>};
-  long double ld4{std::numbers::inv_pi_v<long double>};
-  long double ld5{std::numbers::inv_sqrtpi_v<long double>};
-  long double ld6{std::numbers::ln2_v<long double>};
-  long double ld7{std::numbers::ln10_v<long double>};
-  long double ld8{std::numbers::sqrt2_v<long double>};
-  long double ld9{std::numbers::sqrt3_v<long double>};
-  long double ld10{std::numbers::inv_sqrt3_v<long double>};
-  long double ld11{std::numbers::egamma_v<long double>};
-  long double ld12{std::numbers::phi_v<long double>};
+  [[maybe_unused]] long double ld0{std::numbers::e_v<long double>};
+  [[maybe_unused]] long double ld1{std::numbers::log2e_v<long double>};
+  [[maybe_unused]] long double ld2{std::numbers::log10e_v<long double>};
+  [[maybe_unused]] long double ld3{std::numbers::pi_v<long double>};
+  [[maybe_unused]] long double ld4{std::numbers::inv_pi_v<long double>};
+  [[maybe_unused]] long double ld5{std::numbers::inv_sqrtpi_v<long double>};
+  [[maybe_unused]] long double ld6{std::numbers::ln2_v<long double>};
+  [[maybe_unused]] long double ld7{std::numbers::ln10_v<long double>};
+  [[maybe_unused]] long double ld8{std::numbers::sqrt2_v<long double>};
+  [[maybe_unused]] long double ld9{std::numbers::sqrt3_v<long double>};
+  [[maybe_unused]] long double ld10{std::numbers::inv_sqrt3_v<long double>};
+  [[maybe_unused]] long double ld11{std::numbers::egamma_v<long double>};
+  [[maybe_unused]] long double ld12{std::numbers::phi_v<long double>};
 
   return true;
 }