diff --git a/src/bin/pg_basebackup/pg_recvlogical.c b/src/bin/pg_basebackup/pg_recvlogical.c
index 7b27aab5909122b75c71b8e10ec7dd2c69c6442c..2b1377b5dd573f91cb6e27fb439b10a0f83fac29 100644
--- a/src/bin/pg_basebackup/pg_recvlogical.c
+++ b/src/bin/pg_basebackup/pg_recvlogical.c
@@ -1,7 +1,7 @@
 /*-------------------------------------------------------------------------
  *
- * pg_recvlogical.c - receive data from a logical decoding slot in a streaming fashion
- *					  and write it to to a local file.
+ * pg_recvlogical.c - receive data from a logical decoding slot in a streaming
+ *					  fashion and write it to a local file.
  *
  * Portions Copyright (c) 1996-2014, PostgreSQL Global Development Group
  *
@@ -110,7 +110,7 @@ sendFeedback(PGconn *conn, int64 now, bool force, bool replyRequested)
 	int			len = 0;
 
 	/*
-	 * we normally don't want to send superflous feedbacks, but if it's
+	 * we normally don't want to send superfluous feedbacks, but if it's
 	 * because of a timeout we need to, otherwise wal_sender_timeout will
 	 * kill us.
 	 */
diff --git a/src/test/regress/expected/replica_identity.out b/src/test/regress/expected/replica_identity.out
index 60b866ad7ed35ec3b34c167c2634b2aa243eba6f..a93897f9df0293c830fce70c89097fea8f027cd8 100644
--- a/src/test/regress/expected/replica_identity.out
+++ b/src/test/regress/expected/replica_identity.out
@@ -34,7 +34,7 @@ SELECT relreplident FROM pg_class WHERE oid = 'pg_constraint'::regclass;
 (1 row)
 
 ----
--- Make sure we detect inelegible indexes
+-- Make sure we detect ineligible indexes
 ----
 -- fail, not unique
 ALTER TABLE test_replica_identity REPLICA IDENTITY USING INDEX test_replica_identity_keyab;
diff --git a/src/test/regress/sql/replica_identity.sql b/src/test/regress/sql/replica_identity.sql
index 9d2e9a6e7edc1e6bccf0afbd3c4a145258eeb7d0..20251d6439a4e53a54171c8ca113b5c498ccc850 100644
--- a/src/test/regress/sql/replica_identity.sql
+++ b/src/test/regress/sql/replica_identity.sql
@@ -23,7 +23,7 @@ SELECT relreplident FROM pg_class WHERE oid = 'pg_class'::regclass;
 SELECT relreplident FROM pg_class WHERE oid = 'pg_constraint'::regclass;
 
 ----
--- Make sure we detect inelegible indexes
+-- Make sure we detect ineligible indexes
 ----
 
 -- fail, not unique