diff --git a/test_conformance/api/test_queries.cpp b/test_conformance/api/test_queries.cpp
index b1a07a31..1518062d 100644
--- a/test_conformance/api/test_queries.cpp
+++ b/test_conformance/api/test_queries.cpp
@@ -397,7 +397,7 @@ int test_get_device_info(cl_device_id deviceID, cl_context context, cl_command_q
     // extensions can support double but may not support cl_khr_fp64, which implies math library support.
 
     cl_uint baseAddrAlign;
-    TEST_DEVICE_PARAM( deviceID, CL_DEVICE_MEM_BASE_ADDR_ALIGN, baseAddrAlign, "base address alignment", "%d bytes", int )
+    TEST_DEVICE_PARAM( deviceID, CL_DEVICE_MEM_BASE_ADDR_ALIGN, baseAddrAlign, "base address alignment", "%d bits", int )
 
     cl_uint maxDataAlign;
     TEST_DEVICE_PARAM( deviceID, CL_DEVICE_MIN_DATA_TYPE_ALIGN_SIZE, maxDataAlign, "min data type alignment", "%d bytes", int )
diff --git a/test_conformance/images/clGetInfo/test_2D.cpp b/test_conformance/images/clGetInfo/test_2D.cpp
index 4a72735d..49537075 100644
--- a/test_conformance/images/clGetInfo/test_2D.cpp
+++ b/test_conformance/images/clGetInfo/test_2D.cpp
@@ -132,7 +132,7 @@ int test_get_image_info_single( cl_context context, image_descriptor *imageInfo,
 
   size_t outSlicePitch;
   error = clGetImageInfo( image, CL_IMAGE_SLICE_PITCH, sizeof( outSlicePitch ), &outSlicePitch, NULL );
-  test_error( error, "Unable to get image info (row pitch)" );
+  test_error( error, "Unable to get image info (slice pitch)" );
     if( imageInfo->type == CL_MEM_OBJECT_IMAGE1D && outSlicePitch != 0 )
     {
         log_error( "ERROR: slice pitch returned is invalid! (expected %d, got %d)\n",