diff --git a/contrib/pageinspect/heapfuncs.c b/contrib/pageinspect/heapfuncs.c
index 38eb9783a544ac6c418c0aad791c131ccd8e7def..b7d75b0e75327197275857c5581600393e29373b 100644
--- a/contrib/pageinspect/heapfuncs.c
+++ b/contrib/pageinspect/heapfuncs.c
@@ -436,7 +436,7 @@ tuple_data_split(PG_FUNCTION_ARGS)
 		if (!t_bits_str)
 			ereport(ERROR,
 					(errcode(ERRCODE_DATA_CORRUPTED),
-					 errmsg("argument of t_bits is null, but it is expected to be null and %i character long",
+					 errmsg("argument of t_bits is null, but it is expected to be null and %d character long",
 							bits_len * 8)));
 
 		bits_str_len = strlen(t_bits_str);
@@ -448,7 +448,7 @@ tuple_data_split(PG_FUNCTION_ARGS)
 		if (bits_len * 8 != bits_str_len)
 			ereport(ERROR,
 					(errcode(ERRCODE_DATA_CORRUPTED),
-					 errmsg("unexpected length of t_bits %u, expected %i",
+					 errmsg("unexpected length of t_bits %u, expected %d",
 							bits_str_len, bits_len * 8)));
 
 		/* do the conversion */
diff --git a/src/backend/commands/matview.c b/src/backend/commands/matview.c
index 43acec295d2787a5fc5d620aed9aafb228384a71..f00aab39e7bd297e89a2cc1a23ceb93bdd9500c6 100644
--- a/src/backend/commands/matview.c
+++ b/src/backend/commands/matview.c
@@ -531,7 +531,7 @@ make_temptable_name_n(char *tempname, int n)
 
 	initStringInfo(&namebuf);
 	appendStringInfoString(&namebuf, tempname);
-	appendStringInfo(&namebuf, "_%i", n);
+	appendStringInfo(&namebuf, "_%d", n);
 	return namebuf.data;
 }
 
diff --git a/src/test/isolation/isolation_main.c b/src/test/isolation/isolation_main.c
index ac951f2df2cd1a87a393d34f4fbc615c1a6f06a0..7a51cc1656c8f3540493111634d8868e4bfbc72a 100644
--- a/src/test/isolation/isolation_main.c
+++ b/src/test/isolation/isolation_main.c
@@ -112,7 +112,7 @@ isolation_init(int argc, char **argv)
 	argv0_len = strlcpy(saved_argv0, argv[0], MAXPGPATH);
 	if (argv0_len >= MAXPGPATH)
 	{
-		fprintf(stderr, _("path for isolationtester executable is longer than %i bytes\n"),
+		fprintf(stderr, _("path for isolationtester executable is longer than %d bytes\n"),
 				(int) (MAXPGPATH - 1));
 		exit(2);
 	}