diff --git a/test_conformance/images/kernel_read_write/test_iterations.cpp b/test_conformance/images/kernel_read_write/test_iterations.cpp
index 96f8933363..d30ac0d4e9 100644
--- a/test_conformance/images/kernel_read_write/test_iterations.cpp
+++ b/test_conformance/images/kernel_read_write/test_iterations.cpp
@@ -17,6 +17,7 @@
 #include <float.h>
 
 #include <algorithm>
+#include <cinttypes>
 
 #if defined( __APPLE__ )
     #include <signal.h>
@@ -1481,8 +1482,7 @@ int test_read_image_2D( cl_context context, cl_command_queue queue, cl_kernel ke
         char *imagePtr = (char *)imageValues + nextLevelOffset;
         if( gTestMipmaps )
         {
-            if(gDebugTrace)
-                log_info("\t- Working at mip level %d\n", lod);
+            if (gDebugTrace) log_info("\t- Working at mip level %zu\n", lod);
             error = clSetKernelArg( kernel, idx, sizeof(float), &lod_float);
         }
 
@@ -1743,7 +1743,10 @@ int test_read_image_set_2D(cl_device_id device, cl_context context,
         do
         {
             if( gDebugTrace )
-                log_info( "   at size %d,%d, starting round ramp at %llu for range %llu\n", (int)imageInfo.width, (int)imageInfo.height, gRoundingStartValue, typeRange );
+                log_info("   at size %d,%d, starting round ramp at %" PRIu64
+                         " for range %" PRIu64 "\n",
+                         (int)imageInfo.width, (int)imageInfo.height,
+                         gRoundingStartValue, typeRange);
             int retCode = test_read_image_2D( context, queue, kernel, &imageInfo, imageSampler, floatCoords, outputType, seed );
             if( retCode )
                 return retCode;
diff --git a/test_conformance/images/kernel_read_write/test_read_1D.cpp b/test_conformance/images/kernel_read_write/test_read_1D.cpp
index 0cbf09891d..cab1fa8e3a 100644
--- a/test_conformance/images/kernel_read_write/test_read_1D.cpp
+++ b/test_conformance/images/kernel_read_write/test_read_1D.cpp
@@ -18,6 +18,7 @@
 #include <float.h>
 
 #include <algorithm>
+#include <cinttypes>
 
 #if defined( __APPLE__ )
     #include <signal.h>
@@ -1151,7 +1152,9 @@ int test_read_image_set_1D(cl_device_id device, cl_context context,
         do
         {
             if( gDebugTrace )
-                log_info( "   at size %d, starting round ramp at %llu for range %llu\n", (int)imageInfo.width, gRoundingStartValue, typeRange );
+                log_info("   at size %d, starting round ramp at %" PRIu64
+                         " for range %" PRIu64 "\n",
+                         (int)imageInfo.width, gRoundingStartValue, typeRange);
             int retCode = test_read_image_1D( context, queue, kernel, &imageInfo, imageSampler, floatCoords, outputType, seed );
             if( retCode )
                 return retCode;
diff --git a/test_conformance/images/kernel_read_write/test_read_1D_array.cpp b/test_conformance/images/kernel_read_write/test_read_1D_array.cpp
index a8009420e8..d55d1b09b7 100644
--- a/test_conformance/images/kernel_read_write/test_read_1D_array.cpp
+++ b/test_conformance/images/kernel_read_write/test_read_1D_array.cpp
@@ -17,6 +17,7 @@
 #include <float.h>
 
 #include <algorithm>
+#include <cinttypes>
 
 #if defined( __APPLE__ )
 #include <signal.h>
@@ -1261,7 +1262,10 @@ int test_read_image_set_1D_array(cl_device_id device, cl_context context,
         do
         {
             if( gDebugTrace )
-                log_info( "   at size %d,%d, starting round ramp at %llu for range %llu\n", (int)imageInfo.width, (int)imageInfo.arraySize, gRoundingStartValue, typeRange );
+                log_info("   at size %d,%d, starting round ramp at %" PRIu64
+                         " for range %" PRIu64 "\n",
+                         (int)imageInfo.width, (int)imageInfo.arraySize,
+                         gRoundingStartValue, typeRange);
             int retCode = test_read_image_1D_array( context, queue, kernel, &imageInfo, imageSampler, floatCoords, outputType, seed );
             if( retCode )
                 return retCode;
diff --git a/test_conformance/images/kernel_read_write/test_read_2D_array.cpp b/test_conformance/images/kernel_read_write/test_read_2D_array.cpp
index 533a0fe837..72f1238d3d 100644
--- a/test_conformance/images/kernel_read_write/test_read_2D_array.cpp
+++ b/test_conformance/images/kernel_read_write/test_read_2D_array.cpp
@@ -542,8 +542,7 @@ int test_read_image_2D_array( cl_context context, cl_command_queue queue, cl_ker
         float lod_float = (float)lod;
         if( gTestMipmaps )
         {
-            if(gDebugTrace)
-                log_info(" - Working at mip level %d\n", lod);
+            if (gDebugTrace) log_info(" - Working at mip level %zu\n", lod);
             error = clSetKernelArg( kernel, idx, sizeof(float), &lod_float);
         }
     for( int q = 0; q < loopCount; q++ )
diff --git a/test_conformance/images/kernel_read_write/test_write_1D.cpp b/test_conformance/images/kernel_read_write/test_write_1D.cpp
index 5f7267967e..8e5c15553b 100644
--- a/test_conformance/images/kernel_read_write/test_write_1D.cpp
+++ b/test_conformance/images/kernel_read_write/test_write_1D.cpp
@@ -472,7 +472,7 @@ int test_write_image_1D( cl_device_id device, cl_context context, cl_command_que
                                                   test_value[0] & 0x1F,
                                                   (test_value[0] >> 5) & 0x3F,
                                                   (test_value[0] >> 11) & 0x1F);
-                                        log_error("    Error:    %f %f %f %f\n",
+                                        log_error("    Error:    %f %f %f\n",
                                                   errors[0], errors[1],
                                                   errors[2]);
                                         break;
@@ -497,7 +497,7 @@ int test_write_image_1D( cl_device_id device, cl_context context, cl_command_que
                                                   test_value[0] & 0x1F,
                                                   (test_value[0] >> 5) & 0x1F,
                                                   (test_value[0] >> 10) & 0x1F);
-                                        log_error("    Error:    %f %f %f %f\n",
+                                        log_error("    Error:    %f %f %f\n",
                                                   errors[0], errors[1],
                                                   errors[2]);
                                         break;
diff --git a/test_conformance/images/kernel_read_write/test_write_1D_array.cpp b/test_conformance/images/kernel_read_write/test_write_1D_array.cpp
index f90244052b..a6bf4ec25b 100644
--- a/test_conformance/images/kernel_read_write/test_write_1D_array.cpp
+++ b/test_conformance/images/kernel_read_write/test_write_1D_array.cpp
@@ -493,7 +493,7 @@ int test_write_image_1D_array( cl_device_id device, cl_context context, cl_comma
                                                   test_value[0] & 0x1F,
                                                   (test_value[0] >> 5) & 0x3F,
                                                   (test_value[0] >> 11) & 0x1F);
-                                        log_error("    Error:    %f %f %f %f\n",
+                                        log_error("    Error:    %f %f %f\n",
                                                   errors[0], errors[1],
                                                   errors[2]);
                                         break;
@@ -518,7 +518,7 @@ int test_write_image_1D_array( cl_device_id device, cl_context context, cl_comma
                                                   test_value[0] & 0x1F,
                                                   (test_value[0] >> 5) & 0x1F,
                                                   (test_value[0] >> 10) & 0x1F);
-                                        log_error("    Error:    %f %f %f %f\n",
+                                        log_error("    Error:    %f %f %f\n",
                                                   errors[0], errors[1],
                                                   errors[2]);
                                         break;
diff --git a/test_conformance/images/kernel_read_write/test_write_2D_array.cpp b/test_conformance/images/kernel_read_write/test_write_2D_array.cpp
index c1c5699458..40c90e7be9 100644
--- a/test_conformance/images/kernel_read_write/test_write_2D_array.cpp
+++ b/test_conformance/images/kernel_read_write/test_write_2D_array.cpp
@@ -525,7 +525,7 @@ int test_write_image_2D_array( cl_device_id device, cl_context context, cl_comma
                                                 (test_value[0] >> 5) & 0x3F,
                                                 (test_value[0] >> 11) & 0x1F);
                                             log_error(
-                                                "    Error:    %f %f %f %f\n",
+                                                "    Error:    %f %f %f\n",
                                                 errors[0], errors[1],
                                                 errors[2]);
                                             break;
@@ -554,7 +554,7 @@ int test_write_image_2D_array( cl_device_id device, cl_context context, cl_comma
                                                 (test_value[0] >> 5) & 0x1F,
                                                 (test_value[0] >> 10) & 0x1F);
                                             log_error(
-                                                "    Error:    %f %f %f %f\n",
+                                                "    Error:    %f %f %f\n",
                                                 errors[0], errors[1],
                                                 errors[2]);
                                             break;
diff --git a/test_conformance/images/kernel_read_write/test_write_3D.cpp b/test_conformance/images/kernel_read_write/test_write_3D.cpp
index 9da93695e3..b50ccb6112 100644
--- a/test_conformance/images/kernel_read_write/test_write_3D.cpp
+++ b/test_conformance/images/kernel_read_write/test_write_3D.cpp
@@ -532,7 +532,7 @@ int test_write_image_3D( cl_device_id device, cl_context context, cl_command_que
                                                 (test_value[0] >> 5) & 0x3F,
                                                 (test_value[0] >> 11) & 0x1F);
                                             log_error(
-                                                "    Error:    %f %f %f %f\n",
+                                                "    Error:    %f %f %f\n",
                                                 errors[0], errors[1],
                                                 errors[2]);
                                             break;
@@ -561,7 +561,7 @@ int test_write_image_3D( cl_device_id device, cl_context context, cl_command_que
                                                 (test_value[0] >> 5) & 0x1F,
                                                 (test_value[0] >> 10) & 0x1F);
                                             log_error(
-                                                "    Error:    %f %f %f %f\n",
+                                                "    Error:    %f %f %f\n",
                                                 errors[0], errors[1],
                                                 errors[2]);
                                             break;
diff --git a/test_conformance/images/kernel_read_write/test_write_image.cpp b/test_conformance/images/kernel_read_write/test_write_image.cpp
index 2962697164..69097e3fa5 100644
--- a/test_conformance/images/kernel_read_write/test_write_image.cpp
+++ b/test_conformance/images/kernel_read_write/test_write_image.cpp
@@ -592,7 +592,7 @@ int test_write_image( cl_device_id device, cl_context context, cl_command_queue
                                                   test_value[0] & 0x1F,
                                                   (test_value[0] >> 5) & 0x3F,
                                                   (test_value[0] >> 11) & 0x1F);
-                                        log_error("    Error:    %f %f %f %f\n",
+                                        log_error("    Error:    %f %f %f\n",
                                                   errors[0], errors[1],
                                                   errors[2]);
                                         break;
@@ -618,7 +618,7 @@ int test_write_image( cl_device_id device, cl_context context, cl_command_queue
                                                   test_value[0] & 0x1F,
                                                   (test_value[0] >> 5) & 0x1F,
                                                   (test_value[0] >> 10) & 0x1F);
-                                        log_error("    Error:    %f %f %f %f\n",
+                                        log_error("    Error:    %f %f %f\n",
                                                   errors[0], errors[1],
                                                   errors[2]);
                                         break;