diff --git a/libfreerdp/codec/test/TestFreeRDPCodecProgressive.c b/libfreerdp/codec/test/TestFreeRDPCodecProgressive.c
index e4a5bf9fc..89492ce64 100644
--- a/libfreerdp/codec/test/TestFreeRDPCodecProgressive.c
+++ b/libfreerdp/codec/test/TestFreeRDPCodecProgressive.c
@@ -1102,7 +1102,7 @@ static BOOL test_encode_decode(const char* path)
 			const DWORD b = FreeRDPReadColor(pd, ColorFormat);
 			if (!colordiff(ColorFormat, a, b))
 			{
-				printf("xxxxxxx [%u:%u] [%s] %08X != %08X\n", x, y,
+				printf("xxxxxxx [%" PRIuz ":%" PRIuz "] [%s] %08X != %08X\n", x, y,
 				       FreeRDPGetColorFormatName(ColorFormat), a, b);
 				goto fail;
 			}
diff --git a/libfreerdp/primitives/test/TestPrimitivesYUV.c b/libfreerdp/primitives/test/TestPrimitivesYUV.c
index 51fa1a1d8..33258acca 100644
--- a/libfreerdp/primitives/test/TestPrimitivesYUV.c
+++ b/libfreerdp/primitives/test/TestPrimitivesYUV.c
@@ -238,7 +238,7 @@ static BOOL TestPrimitiveYUVCombine(primitives_t* prims, prim_size_t roi)
 	awidth = roi.width + 16 - roi.width % 16;
 	aheight = roi.height + 16 - roi.height % 16;
 	(void)fprintf(stderr,
-	              "Running YUVCombine on frame size %" PRIu32 "x%" PRIu32 " [%" PRIu32 "x%" PRIu32
+	              "Running YUVCombine on frame size %" PRIu32 "x%" PRIu32 " [%" PRIuz "x%" PRIuz
 	              "]\n",
 	              roi.width, roi.height, awidth, aheight);
 	PROFILER_CREATE(yuvCombine, "YUV420CombineToYUV444")
diff --git a/libfreerdp/utils/test/TestRingBuffer.c b/libfreerdp/utils/test/TestRingBuffer.c
index ebe868128..de8417e44 100644
--- a/libfreerdp/utils/test/TestRingBuffer.c
+++ b/libfreerdp/utils/test/TestRingBuffer.c
@@ -131,7 +131,7 @@ int TestRingBuffer(int argc, char* argv[])
 		{
 			(void)fprintf(stderr,
 			              "invalid byte at %" PRIuz ", got %" PRIu8 " instead of %" PRIuz "\n", i,
-			              chunks[0].data[i], i % 5ULL);
+			              chunks[0].data[i], i % 5U);
 			return -1;
 		}
 	}
diff --git a/winpr/libwinpr/sysinfo/test/TestGetComputerName.c b/winpr/libwinpr/sysinfo/test/TestGetComputerName.c
index 716f46aa2..7cf3bf122 100644
--- a/winpr/libwinpr/sysinfo/test/TestGetComputerName.c
+++ b/winpr/libwinpr/sysinfo/test/TestGetComputerName.c
@@ -74,7 +74,7 @@ static BOOL Test_GetComputerName(void)
 	{
 		(void)fprintf(stderr,
 		              "%s: (5) GetComputerNameA returned wrong size %" PRIu32
-		              " (expected something in the range from 2 to %" PRIu32 ")\n",
+		              " (expected something in the range from 2 to %" PRIuz ")\n",
 		              __func__, dwSize, netbiosBufferSize);
 		return FALSE;
 	}
diff --git a/winpr/libwinpr/utils/test/TestArrayList.c b/winpr/libwinpr/utils/test/TestArrayList.c
index c36dbfcf1..433af49fc 100644
--- a/winpr/libwinpr/utils/test/TestArrayList.c
+++ b/winpr/libwinpr/utils/test/TestArrayList.c
@@ -45,7 +45,7 @@ int TestArrayList(int argc, char* argv[])
 	ArrayList_Remove(arrayList, (void*)(size_t)100);
 
 	rc = ArrayList_IndexOf(arrayList, (void*)(size_t)6, -1, -1);
-	printf("ArrayList index: %d\n", rc);
+	printf("ArrayList index: %" PRIdz "\n", rc);
 
 	if (rc != 6)
 		goto fail;
@@ -66,7 +66,7 @@ int TestArrayList(int argc, char* argv[])
 	}
 
 	rc = ArrayList_IndexOf(arrayList, (void*)elemsToInsert, -1, -1);
-	printf("ArrayList index: %d\n", rc);
+	printf("ArrayList index: %" PRIdz "\n", rc);
 	if (rc != -1)
 		goto fail;
 
diff --git a/winpr/libwinpr/utils/test/TestBufferPool.c b/winpr/libwinpr/utils/test/TestBufferPool.c
index 0e224c9cd..baeefe417 100644
--- a/winpr/libwinpr/utils/test/TestBufferPool.c
+++ b/winpr/libwinpr/utils/test/TestBufferPool.c
@@ -28,8 +28,8 @@ int TestBufferPool(int argc, char* argv[])
 
 	if (BufferSize != DefaultSize)
 	{
-		printf("BufferPool_GetBufferSize failure: Actual: %d Expected: %" PRIu32 "\n", BufferSize,
-		       DefaultSize);
+		printf("BufferPool_GetBufferSize failure: Actual: %" PRIdz " Expected: %" PRIu32 "\n",
+		       BufferSize, DefaultSize);
 		return -1;
 	}
 
@@ -37,8 +37,8 @@ int TestBufferPool(int argc, char* argv[])
 
 	if (BufferSize != DefaultSize)
 	{
-		printf("BufferPool_GetBufferSize failure: Actual: %d Expected: %" PRIu32 "\n", BufferSize,
-		       DefaultSize);
+		printf("BufferPool_GetBufferSize failure: Actual: %" PRIdz " Expected: %" PRIu32 "\n",
+		       BufferSize, DefaultSize);
 		return -1;
 	}
 
@@ -46,7 +46,7 @@ int TestBufferPool(int argc, char* argv[])
 
 	if (BufferSize != 2048)
 	{
-		printf("BufferPool_GetBufferSize failure: Actual: %d Expected: 2048\n", BufferSize);
+		printf("BufferPool_GetBufferSize failure: Actual: %" PRIdz " Expected: 2048\n", BufferSize);
 		return -1;
 	}
 
diff --git a/winpr/libwinpr/utils/test/img-cnv.c b/winpr/libwinpr/utils/test/img-cnv.c
index ea3208e00..edb7c6e07 100644
--- a/winpr/libwinpr/utils/test/img-cnv.c
+++ b/winpr/libwinpr/utils/test/img-cnv.c
@@ -34,7 +34,7 @@ static int detect_format(const char* name)
 	const char* dot = strrchr(name, '.');
 	if (!dot)
 	{
-		(void)fprintf(stderr, "'%s' does not have a file extension\n");
+		(void)fprintf(stderr, "'%s' does not have a file extension\n", name);
 		return -1;
 	}