diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm
index dbddd41bfca..7893e8bf704 100644
--- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm
+++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm
@@ -112,6 +112,25 @@ sub adjust_database_contents
 			'drop extension if exists test_ext7');
 	}
 
+	# We can no longer upgrade bpchar indexes that claim deduplication ability
+	# (amcheck will complain about them), so drop them if source is pre-v14.
+	if ($old_version < 14)
+	{
+		if ($dbnames{"regression"})
+		{
+			_add_st($result, 'regression',
+					'drop index if exists public.hslot_hubname',
+					'drop index if exists public.hslot_name',
+					'drop index if exists public.hub_name',
+					'drop index if exists public.iface_name',
+					'drop index if exists public.phone_name',
+					'drop index if exists public.pline_name',
+					'drop index if exists public.pslot_name',
+					'drop index if exists public.room_rno',
+					'drop index if exists public.wslot_name');
+		}
+	}
+
 	# btree_gist inet/cidr indexes cannot be upgraded to v19
 	if ($old_version < 19)
 	{