diff --git a/src/test/regress/GNUmakefile b/src/test/regress/GNUmakefile
index 3db2847b1620edf1516cb99a56fd247d3a599ab9..0dc2deeda37fd3b1ec7e0268c0d1e0581c2854f8 100644
--- a/src/test/regress/GNUmakefile
+++ b/src/test/regress/GNUmakefile
@@ -56,15 +56,25 @@ endif
 
 ifeq ($(cpu_bit), aarch64)
 define exception_arm_cases
+	cp $(srcdir)/parallel_schedule $(srcdir)/_parallel_schedule_bak_
 	sed -i '/xc_copy/s/xc_copy/xc_copy_arm/g' $(srcdir)/parallel_schedule
 	sed -i '/hw_cstore_alter1/s/hw_cstore_alter1/hw_cstore_alter1_arm/g' $(srcdir)/parallel_schedule
 	sed -i '/bulkload_end/s/bulkload_end/bulkload_end_arm/g' $(srcdir)/parallel_schedule
 	sed -i '/bulkload_error_tbl/s/bulkload_error_tbl/bulkload_error_tbl_arm/g' $(srcdir)/parallel_schedule
 endef
+
+define exception_arm_cases_restore
+	if [ -f $(srcdir)/_parallel_schedule_bak_ ]; then \
+		mv $(srcdir)/_parallel_schedule_bak_ $(srcdir)/parallel_schedule; \
+	fi
+endef
 else
 define exception_arm_cases
 	export CODE_BASE=$(realpath $(top_builddir)/../)
 endef
+
+define exception_arm_cases_restore
+endef
 endif
 
 # stuff to pass into build of pg_regress
@@ -183,7 +193,7 @@ aiecheck: all tablespace-setup
 fastcheck_initdb: all tablespace-setup
 	export LD_LIBRARY_PATH=$(SSL_LIB_PATH):$(LD_LIBRARY_PATH) && \
 	$(call exception_arm_cases) && \
-        $(pg_regress_check) $(REGRESS_OPTS) -d $(d) -c $(c) -p $(p) -r 0 -b $(dir) -n $(n) --abs_gausshome=$(abs_gausshome) --schedule=$(srcdir)/parallel_schedule$(PART) -w --keep_last_data=${keep_last_data} $(MAXCONNOPT) --temp-config=$(srcdir)/make_fastcheck_postgresql.conf --init_database $(EXTRA_TESTS) $(REG_CONF)
+        $(pg_regress_check) $(REGRESS_OPTS) -d $(d) -c $(c) -p $(p) -r 0 -b $(dir) -n $(n) --abs_gausshome=$(abs_gausshome) --schedule=$(srcdir)/parallel_schedule$(PART) -w --keep_last_data=${keep_last_data} $(MAXCONNOPT) --temp-config=$(srcdir)/make_fastcheck_postgresql.conf --init_database $(EXTRA_TESTS) $(REG_CONF); $(call exception_arm_cases_restore)
 
 fastcheck_single: all tablespace-setup
 	export LD_LIBRARY_PATH=$(SSL_LIB_PATH):$(LD_LIBRARY_PATH) && \
@@ -196,12 +206,12 @@ fastcheck_single_mot: all tablespace-setup
 fastcheck_parallel_initdb: all tablespace-setup
 	export LD_LIBRARY_PATH=$(SSL_LIB_PATH):$(LD_LIBRARY_PATH) && \
 	$(call exception_arm_cases) && \
-	$(pg_regress_check) $(REGRESS_OPTS) --parallel_initdb -d 1 -c 0 -p $(p) -r $(runtest) -b $(dir) -n $(n) --abs_gausshome=$(abs_gausshome) --single_node --schedule=$(srcdir)/parallel_schedule$(PART) -w --keep_last_data=${keep_last_data} $(MAXCONNOPT) --temp-config=$(srcdir)/make_fastcheck_postgresql.conf $(EXTRA_TESTS) $(REG_CONF)
+	$(pg_regress_check) $(REGRESS_OPTS) --parallel_initdb -d 1 -c 0 -p $(p) -r $(runtest) -b $(dir) -n $(n) --abs_gausshome=$(abs_gausshome) --single_node --schedule=$(srcdir)/parallel_schedule$(PART) -w --keep_last_data=${keep_last_data} $(MAXCONNOPT) --temp-config=$(srcdir)/make_fastcheck_postgresql.conf $(EXTRA_TESTS) $(REG_CONF); $(call exception_arm_cases_restore)
 
 fastcheck: all tablespace-setup
 	export LD_LIBRARY_PATH=$(SSL_LIB_PATH):$(LD_LIBRARY_PATH) && \
 	$(call exception_arm_cases) && \
-	$(pg_regress_check) $(REGRESS_OPTS) -d 1 -c 0 -p $(p) -r $(runtest) -b $(dir) -n $(n) --abs_gausshome=$(abs_gausshome) --single_node --schedule=$(srcdir)/parallel_schedule$(PART) -w --keep_last_data=${keep_last_data} $(MAXCONNOPT) --temp-config=$(srcdir)/make_fastcheck_postgresql.conf $(EXTRA_TESTS) $(REG_CONF)
+	$(pg_regress_check) $(REGRESS_OPTS) -d 1 -c 0 -p $(p) -r $(runtest) -b $(dir) -n $(n) --abs_gausshome=$(abs_gausshome) --single_node --schedule=$(srcdir)/parallel_schedule$(PART) -w --keep_last_data=${keep_last_data} $(MAXCONNOPT) --temp-config=$(srcdir)/make_fastcheck_postgresql.conf $(EXTRA_TESTS) $(REG_CONF); $(call exception_arm_cases_restore)
 
 securitycheck: all tablespace-setup
 	export LD_LIBRARY_PATH=$(SSL_LIB_PATH):$(LD_LIBRARY_PATH) && \
@@ -214,7 +224,7 @@ installcheck: all tablespace-setup
 installcheck-parallel: all tablespace-setup
 	export LD_LIBRARY_PATH=$(SSL_LIB_PATH):$(LD_LIBRARY_PATH) && \
 	$(call exception_arm_cases) && \
-	$(pg_regress_installcheck) $(REGRESS_OPTS) -p $(p) --schedule=$(srcdir)/parallel_schedule$(PART) $(MAXCONNOPT) $(EXTRA_TESTS) $(REG_CONF) --abs_gausshome=$(GAUSSHOME)
+	$(pg_regress_installcheck) $(REGRESS_OPTS) -p $(p) --schedule=$(srcdir)/parallel_schedule$(PART) $(MAXCONNOPT) $(EXTRA_TESTS) $(REG_CONF) --abs_gausshome=$(GAUSSHOME); $(call exception_arm_cases_restore)
 
 ##
 ## Clean up