diff --git a/src/test/regress/bin/normalize.sed b/src/test/regress/bin/normalize.sed
index 809698618..420c7bb30 100644
--- a/src/test/regress/bin/normalize.sed
+++ b/src/test/regress/bin/normalize.sed
@@ -30,9 +30,9 @@ s/"t2_[0-9]+"/"t2_xxxxxxx"/g
 
 # shard table names for custom_aggregate_support
 s/ daily_uniques_[0-9]+ / daily_uniques_xxxxxxx /g
-#
-## In foreign_key_restriction_enforcement, normalize shard names
-#s/"(on_update_fkey_table_|fkey_)[0-9]+"/"\1xxxxxxx"/g
+
+# In foreign_key_restriction_enforcement, normalize shard names
+s/"(on_update_fkey_table_|fkey_)[0-9]+"/"\1xxxxxxx"/g
 #
 ## In multi_insert_select_conflict, normalize shard name and constraints
 #s/"(target_table_|target_table_|test_ref_table_)[0-9]+"/"\1xxxxxxx"/g
diff --git a/src/test/regress/expected/foreign_key_restriction_enforcement.out b/src/test/regress/expected/foreign_key_restriction_enforcement.out
index fa8af16a7..b2d1c03a1 100644
--- a/src/test/regress/expected/foreign_key_restriction_enforcement.out
+++ b/src/test/regress/expected/foreign_key_restriction_enforcement.out
@@ -471,7 +471,7 @@ BEGIN;
 DEBUG:  switching to sequential query execution mode
 DETAIL:  Reference relation "transitive_reference_table" is modified, which might lead to data inconsistencies or distributed deadlocks via parallel accesses to hash distributed relations due to foreign keys. Any parallel modification to those hash distributed relations in the same transaction can only be executed in sequential query execution mode
 	UPDATE on_update_fkey_table SET value_1 = 101 WHERE id = 1;
-ERROR:  insert or update on table "on_update_fkey_table_2380002" violates foreign key constraint "fkey_2380002"
+ERROR:  insert or update on table "on_update_fkey_table_xxxxxxx" violates foreign key constraint "fkey_xxxxxxx"
 DETAIL:  Key (value_1)=(101) is not present in table "reference_table_2380001".
 CONTEXT:  while executing command on localhost:xxxxx
 	UPDATE on_update_fkey_table SET value_1 = 101 WHERE id = 2;
@@ -525,7 +525,7 @@ BEGIN;
 DEBUG:  switching to sequential query execution mode
 DETAIL:  Reference relation "transitive_reference_table" is modified, which might lead to data inconsistencies or distributed deadlocks via parallel accesses to hash distributed relations due to foreign keys. Any parallel modification to those hash distributed relations in the same transaction can only be executed in sequential query execution mode
 	COPY on_update_fkey_table FROM STDIN WITH CSV;
-ERROR:  insert or update on table "on_update_fkey_table_2380004" violates foreign key constraint "fkey_2380004"
+ERROR:  insert or update on table "on_update_fkey_table_xxxxxxx" violates foreign key constraint "fkey_xxxxxxx"
 DETAIL:  Key (value_1)=(101) is not present in table "reference_table_2380001".
 ROLLBACK;
 -- case 2.8: UPDATE to a reference table is followed by TRUNCATE
diff --git a/src/test/regress/expected/foreign_key_to_reference_table.out b/src/test/regress/expected/foreign_key_to_reference_table.out
index 397f04381..91a835518 100644
--- a/src/test/regress/expected/foreign_key_to_reference_table.out
+++ b/src/test/regress/expected/foreign_key_to_reference_table.out
@@ -1814,7 +1814,7 @@ ALTER TABLE referencing_table_4 ADD CONSTRAINT fkey FOREIGN KEY (id) REFERENCES
 ALTER TABLE referencing_table_4 ADD CONSTRAINT fkey_to_ref FOREIGN KEY (value_1) REFERENCES referenced_table;
 -- should fail since the data will flow to partitioning_test_4 and it has a foreign constraint to partitioning_test_0 on id column
 INSERT INTO referencing_table VALUES (0, 5);
-ERROR:  insert or update on table "referencing_table_4_7000540" violates foreign key constraint "fkey_7000540"
+ERROR:  insert or update on table "referencing_table_4_7000540" violates foreign key constraint "fkey_xxxxxxx"
 DETAIL:  Key (id)=(X) is not present in table "referencing_table_0_xxxxxxx".
 CONTEXT:  while executing command on localhost:xxxxx
 -- should succeed on partitioning_test_0
diff --git a/src/test/regress/expected/multi_insert_select_conflict.out b/src/test/regress/expected/multi_insert_select_conflict.out
index f136998f3..47a84a9cf 100644
--- a/src/test/regress/expected/multi_insert_select_conflict.out
+++ b/src/test/regress/expected/multi_insert_select_conflict.out
@@ -306,7 +306,7 @@ NOTICE:  truncate cascades to table "target_table"
 		col_2,
 		col_1
 	FROM source_table_1 ON CONFLICT (col_1) DO UPDATE SET col_2 = 55 RETURNING *;
-ERROR:  insert or update on table "target_table_1900000" violates foreign key constraint "fkey_1900000"
+ERROR:  insert or update on table "target_table_1900000" violates foreign key constraint "fkey_xxxxxxx"
 DETAIL:  Key (col_1)=(1) is not present in table "test_ref_table_1900012".
 CONTEXT:  while executing command on localhost:xxxxx
 ROLLBACK;