diff --git a/src/backend/backup/basebackup.c b/src/backend/backup/basebackup.c
index 9fcd6d135d3..a28b8849c19 100644
--- a/src/backend/backup/basebackup.c
+++ b/src/backend/backup/basebackup.c
@@ -641,12 +641,11 @@ perform_base_backup(basebackup_options *opt, bbsink *sink)
 
 	if (total_checksum_failures)
 	{
-		if (total_checksum_failures > 1)
-			ereport(WARNING,
-					(errmsg_plural("%lld total checksum verification failure",
-								   "%lld total checksum verification failures",
-								   total_checksum_failures,
-								   total_checksum_failures)));
+		ereport(WARNING,
+				(errmsg_plural("%lld total checksum verification failure",
+							   "%lld total checksum verification failures",
+							   total_checksum_failures,
+							   total_checksum_failures)));
 
 		ereport(ERROR,
 				(errcode(ERRCODE_DATA_CORRUPTED),
@@ -1717,7 +1716,7 @@ sendFile(bbsink *sink, const char *readfilename, const char *tarfilename,
 
 	CloseTransientFile(fd);
 
-	if (checksum_failures > 1)
+	if (checksum_failures > 0)
 	{
 		ereport(WARNING,
 				(errmsg_plural("file \"%s\" has a total of %d checksum verification failure",
diff --git a/src/bin/pg_basebackup/t/010_pg_basebackup.pl b/src/bin/pg_basebackup/t/010_pg_basebackup.pl
index 7f29036f78b..3d2e0ec9a2c 100644
--- a/src/bin/pg_basebackup/t/010_pg_basebackup.pl
+++ b/src/bin/pg_basebackup/t/010_pg_basebackup.pl
@@ -808,6 +808,13 @@ $node->command_checks_all(
 	'pg_basebackup reports checksum mismatch');
 rmtree("$tempdir/backup_corrupt");
 
+# Single failure counted in pg_stat_database.
+ok( $node->poll_query_until(
+		'postgres',
+		'SELECT checksum_failures = 1 FROM pg_stat_database '
+		  . "WHERE datname = 'postgres';"),
+	'checksum failure reported in pg_stat_database');
+
 # induce further corruption in 5 more blocks
 $node->stop;
 for my $i (1 .. 5)
@@ -837,6 +844,13 @@ $node->command_checks_all(
 	'pg_basebackup correctly report the total number of checksum mismatches');
 rmtree("$tempdir/backup_corrupt3");
 
+# Failures across all the backups.
+ok( $node->poll_query_until(
+		'postgres',
+		'SELECT checksum_failures = 14 FROM pg_stat_database '
+		  . "WHERE datname = 'postgres';"),
+	'checksum failures accumulated in pg_stat_database');
+
 # do not verify checksums, should return ok
 $node->command_ok(
 	[