diff --git a/test_conformance/conversions/CMakeLists.txt b/test_conformance/conversions/CMakeLists.txt
index 037430ef..32990eba 100644
--- a/test_conformance/conversions/CMakeLists.txt
+++ b/test_conformance/conversions/CMakeLists.txt
@@ -12,6 +12,6 @@ if("${CLConform_TARGET_ARCH}" STREQUAL "ARM" OR "${CLConform_TARGET_ARCH}" STREQ
     list(APPEND ${MODULE_NAME}_SOURCES fplib.cpp)
 endif()
 
-set_gnulike_module_compile_flags("-Wno-sign-compare -Wno-format")
+set_gnulike_module_compile_flags("-Wno-sign-compare")
 
 include(../CMakeCommon.txt)
diff --git a/test_conformance/conversions/basic_test_conversions.cpp b/test_conformance/conversions/basic_test_conversions.cpp
index edad671b..34463869 100644
--- a/test_conformance/conversions/basic_test_conversions.cpp
+++ b/test_conformance/conversions/basic_test_conversions.cpp
@@ -318,7 +318,7 @@ int CalcRefValsPat<InType, OutType, InFP, OutFP>::check_result(void *test,
 {
     const cl_uchar *a = (const cl_uchar *)gAllowZ;
 
-    if (is_half<OutType, OutFP>())
+    if constexpr (is_half<OutType, OutFP>())
     {
         const cl_half *t = (const cl_half *)test;
         const cl_half *c = (const cl_half *)gRef;
@@ -335,7 +335,7 @@ int CalcRefValsPat<InType, OutType, InFP, OutFP>::check_result(void *test,
                 return i + 1;
             }
     }
-    else if (std::is_integral<OutType>::value)
+    else if constexpr (std::is_integral<OutType>::value)
     { // char/uchar/short/ushort/half/int/uint/long/ulong
         const OutType *t = (const OutType *)test;
         const OutType *c = (const OutType *)gRef;
@@ -350,7 +350,7 @@ int CalcRefValsPat<InType, OutType, InFP, OutFP>::check_result(void *test,
                 return i + 1;
             }
     }
-    else if (std::is_same<OutType, cl_float>::value)
+    else if constexpr (std::is_same<OutType, cl_float>::value)
     {
         // cast to integral - from original test
         const cl_uint *t = (const cl_uint *)test;