diff --git a/src/util/arch/ppc64el/simd_utils.h b/src/util/arch/ppc64el/simd_utils.h
index 7b0f62a0..15446e87 100644
--- a/src/util/arch/ppc64el/simd_utils.h
+++ b/src/util/arch/ppc64el/simd_utils.h
@@ -46,6 +46,7 @@
 #if defined(__clang__) && (__clang_major__ == 15)
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdeprecate-lax-vec-conv-all"
+#endif // defined(__clang__) && (__clang_major__ == 15)
 
 typedef __vector unsigned long long int  uint64x2_t;
 typedef __vector   signed long long int   int64x2_t;
@@ -424,6 +425,7 @@ m128 set2x64(u64a hi, u64a lo) {
     return (m128) v;
 }
 
+#if defined(__clang__) && (__clang_major__ == 15)
 #pragma clang diagnostic pop
 #endif // defined(__clang__) && (__clang_major__ == 15)
 
diff --git a/src/util/supervector/arch/ppc64el/impl.cpp b/src/util/supervector/arch/ppc64el/impl.cpp
index 05aaba41..cd776d5a 100644
--- a/src/util/supervector/arch/ppc64el/impl.cpp
+++ b/src/util/supervector/arch/ppc64el/impl.cpp
@@ -161,12 +161,14 @@ really_inline SuperVector<16>::SuperVector(uint32_t const other)
 #if defined(__clang__) && (__clang_major__ == 15)
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdeprecate-lax-vec-conv-all"
+#endif // defined(__clang__) && (__clang_major__ == 15)
 template<>
 template<>
 really_inline SuperVector<16>::SuperVector(int64_t const other)
 {
     u.s64x2[0] = static_cast<int64x2_t>(vec_splats(static_cast<ulong64_t>(other)));
 }
+#if defined(__clang__) && (__clang_major__ == 15)
 #pragma clang diagnostic pop
 #endif // defined(__clang__) && (__clang_major__ == 15)
 
diff --git a/unit/internal/simd_utils.cpp b/unit/internal/simd_utils.cpp
index 510a0ed1..dd7bae9e 100644
--- a/unit/internal/simd_utils.cpp
+++ b/unit/internal/simd_utils.cpp
@@ -676,8 +676,10 @@ TEST(SimdUtilsTest, movq) {
 #if defined(__clang__) && (__clang_major__ == 15)
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdeprecate-lax-vec-conv-all"
+#endif // defined(__clang__) && (__clang_major__ == 15)
     int64x2_t a = {0x123456789abcdefLL, ~0LL };
     simd = static_cast<m128>(a);
+#if defined(__clang__) && (__clang_major__ == 15)
 #pragma clang diagnostic pop
 #endif // defined(__clang__) && (__clang_major__ == 15)
 #endif