diff --git a/src/test/regress/output/query_info_hook_test.source b/src/test/regress/output/query_info_hook_test.source
index f0112938e13c6846254531a13621f8afdc0b3214..519f37729bb9900458829908cd0f9959834f7667 100644
--- a/src/test/regress/output/query_info_hook_test.source
+++ b/src/test/regress/output/query_info_hook_test.source
@@ -47,13 +47,6 @@ ALTER TABLE queryInfoHookTable1 SET DISTRIBUTED BY (name);
 WARNING:  Query submit
 WARNING:  Query start
 WARNING:  Plan node initializing
-WARNING:  Plan node executing node_type: RESULT
-WARNING:  Plan node finished
-WARNING:  Query done
-WARNING:  Query submit
-WARNING:  Query start
-WARNING:  Plan node initializing
-WARNING:  Plan node executing node_type: MOTION
 WARNING:  Plan node finished
 WARNING:  Plan node finished
 WARNING:  Query done
@@ -64,10 +57,6 @@ WARNING:  Query submit
 WARNING:  Query start
 WARNING:  Plan node initializing
 WARNING:  Plan node executing node_type: MOTION
-WARNING:  Plan node executing node_type: HASHJOIN
-WARNING:  Plan node executing node_type: HASH
-WARNING:  Plan node finished
-WARNING:  Query done
 WARNING:  Plan node finished
 WARNING:  Plan node finished
 WARNING:  Plan node finished
diff --git a/src/test/regress/query_info_hook_test/query_info_hook_test.c b/src/test/regress/query_info_hook_test/query_info_hook_test.c
index 219cef613a5d56d389f39844648f781a11e35214..15facca08b4988463c217c52028ab54e1d2cce24 100644
--- a/src/test/regress/query_info_hook_test/query_info_hook_test.c
+++ b/src/test/regress/query_info_hook_test/query_info_hook_test.c
@@ -1,6 +1,7 @@
 #include "postgres.h"
 
 #include "fmgr.h"
+#include "cdb/cdbvars.h"
 #include "utils/metrics_utils.h"
 #include "nodes/execnodes.h"
 #include "nodes/print.h"
@@ -32,6 +33,11 @@ _PG_fini(void)
 static void
 test_hook(QueryMetricsStatus status, void* args)
 {
+	if (Gp_role != GP_ROLE_DISPATCH)
+		return;
+	if (GpIdentity.segindex > -1)
+		return;
+
 	switch (status)
 	{
 		case METRICS_PLAN_NODE_INITIALIZE: