diff --git a/src/bin/gpfdist/gpfdist.c b/src/bin/gpfdist/gpfdist.c
index 202a2e629fa1042aefcaeb92902577d2b1ceca96..17361ed0c6b510302e6d80b8271342ec6aed2646 100644
--- a/src/bin/gpfdist/gpfdist.c
+++ b/src/bin/gpfdist/gpfdist.c
@@ -3611,7 +3611,6 @@ int gpfdist_init(int argc, const char* const argv[])
 
 	if (wd != NULL)
 	{
-		errno = 0;
 		val = strtol(wd, &endptr, 10);
 
 		if (errno || endptr == wd || val > INT_MAX)
diff --git a/src/bin/gpfdist/regress/test_watchdog.sh b/src/bin/gpfdist/regress/test_watchdog.sh
index 686235a013fe0e0e69b217ddbb186f2e0e3e8637..2d7b0e10f71fea43d8fb09c1d6ea3e3bcf562c9d 100644
--- a/src/bin/gpfdist/regress/test_watchdog.sh
+++ b/src/bin/gpfdist/regress/test_watchdog.sh
@@ -2,17 +2,10 @@
 
 GPFDIST_PID=gpfdist.pid
 
-export GPFDIST_WATCHDOG_TIMER=5
+export GPFDIST_WATCHDOG_TIMER=3
 gpfdist &
 PID=$!
 
-sleep 3
-ps -p $PID
-if [ $? -ne 0 ]; then
-wait $PID
-echo "gpfdist should be running, failed"
-exit 1
-fi
 sleep 5
 ps -p $PID
 if [ $? -eq 0 ]; then