diff --git a/GNUmakefile.in b/GNUmakefile.in
index 4b6b8002a62b6bfb0d6fbb6677068ebaf22fd697..d4461bfc6c5a45cd35e898f286266236da51cb69 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -162,8 +162,7 @@ installcheck-world:
 	# Verify the filesystem objects are consistent between primary and mirror
 	$(MAKE) -C contrib/gp_replica_check installcheck
 
-	# WALREP_FIXME: pg_upgrade doesn't work yet?
-	#$(MAKE) -C contrib/pg_upgrade check
+	$(MAKE) -C contrib/pg_upgrade check
 
 installcheck-resgroup:
 	$(MAKE) -C src/test/isolation2 $@
diff --git a/contrib/pg_upgrade/aotable.c b/contrib/pg_upgrade/aotable.c
index 3b543efd9e08fb83b913e20b61a8623c8e7142ed..350664ee63da0809f8f8e22c77688d3e70618e3d 100644
--- a/contrib/pg_upgrade/aotable.c
+++ b/contrib/pg_upgrade/aotable.c
@@ -168,7 +168,7 @@ restore_aosegment_tables(migratorContext *ctx)
 	prep_status(ctx, "Restoring append-only auxiliary tables in new cluster");
 
 	/*
-	 * Rebuilding gp_relation_node can potentially take some time in a large
+	 * Rebuilding AO auxiliary tables can potentially take some time in a large
 	 * cluster so swap out the current progress file before starting so that
 	 * the user can see what's going on.
 	 */
@@ -188,12 +188,6 @@ restore_aosegment_tables(migratorContext *ctx)
 		PQclear(executeQueryOrDie(ctx, conn,
 								  "set allow_system_table_mods='dml'"));
 
-		/*
-		 * There are further safeguards for gp_relation_node. Bypass those too.
-		 */
-		PQclear(executeQueryOrDie(ctx, conn,
-								  "set gp_permit_relation_node_change = on"));
-
 		for (relnum = 0; relnum < olddb->rel_arr.nrels; relnum++)
 			restore_aosegment_table(ctx, conn, &olddb->rel_arr.rels[relnum]);
 
diff --git a/contrib/pg_upgrade/function.c b/contrib/pg_upgrade/function.c
index cdf227c1f86435ba5fb43fb09bba9c178e393da1..1757492879ad5f69f13b70557ed1a98b0d2153cb 100644
--- a/contrib/pg_upgrade/function.c
+++ b/contrib/pg_upgrade/function.c
@@ -58,12 +58,6 @@ install_system_functions_internal(migratorContext *ctx, char *dbname)
 							  "RETURNS VOID "
 							  "AS '$libdir/pg_upgrade_support' "
 							  "LANGUAGE C STRICT;"));
-	PQclear(executeQueryOrDie(ctx, conn,
-							  "CREATE OR REPLACE FUNCTION "
-							  "binary_upgrade.preassign_filespace_oid(OID, TEXT) "
-							  "RETURNS VOID "
-							  "AS '$libdir/pg_upgrade_support' "
-							  "LANGUAGE C STRICT;"));
 	PQclear(executeQueryOrDie(ctx, conn,
 							  "CREATE OR REPLACE FUNCTION "
 							  "binary_upgrade.preassign_tablespace_oid(OID, TEXT) "
diff --git a/contrib/pg_upgrade_support/pg_upgrade_support.c b/contrib/pg_upgrade_support/pg_upgrade_support.c
index a2e278d9d172b35fdddb9148835c6fa8915f2f40..b5a0b4f72a5d206772c7049226ce267f38d3fd84 100644
--- a/contrib/pg_upgrade_support/pg_upgrade_support.c
+++ b/contrib/pg_upgrade_support/pg_upgrade_support.c
@@ -145,7 +145,6 @@ create_empty_extension(PG_FUNCTION_ARGS)
 Datum		preassign_type_oid(PG_FUNCTION_ARGS);
 Datum		preassign_arraytype_oid(PG_FUNCTION_ARGS);
 Datum		preassign_extprotocol_oid(PG_FUNCTION_ARGS);
-Datum		preassign_filespace_oid(PG_FUNCTION_ARGS);
 Datum		preassign_tablespace_oid(PG_FUNCTION_ARGS);
 Datum		preassign_opclass_oid(PG_FUNCTION_ARGS);
 Datum		preassign_conversion_oid(PG_FUNCTION_ARGS);
@@ -177,7 +176,6 @@ Datum		preassign_user_mapping_oid(PG_FUNCTION_ARGS);
 PG_FUNCTION_INFO_V1(preassign_type_oid);
 PG_FUNCTION_INFO_V1(preassign_arraytype_oid);
 PG_FUNCTION_INFO_V1(preassign_extprotocol_oid);
-PG_FUNCTION_INFO_V1(preassign_filespace_oid);
 PG_FUNCTION_INFO_V1(preassign_tablespace_oid);
 PG_FUNCTION_INFO_V1(preassign_opclass_oid);
 PG_FUNCTION_INFO_V1(preassign_conversion_oid);