diff --git a/gpMgmt/Makefile.behave b/gpMgmt/Makefile.behave
index 32d5d97f5e7242e5ec42d75648aba740923f527a..2919c25372c253d4c327928c6c543041ebf97c60 100644
--- a/gpMgmt/Makefile.behave
+++ b/gpMgmt/Makefile.behave
@@ -10,12 +10,14 @@ TAR?=$(shell which tar)
 $(BEHAVE_BIN):
 	TAR=$(TAR) make -C bin $(BEHAVE_BIN)
 
+# To pass in custom flags as behave args(such as multiple flags),
+# use flags=--tags=foo, --tags=-bar
 behave: $(BEHAVE_BIN)
 	@echo "Running behave on management scripts..."
-	if [ -n ""$(tags)"" ] && [ -n ""$(skip_tags)"" ]; then \
-	        PYTHONPATH=$(PYTHONSRC_INSTALL_PYTHON_PATH):$(GPMGMT_SRC) python $(BEHAVE_BIN) $(GPMGMT_SRC)/test/behave/* -s -k --tags=$(tags) --tags=$(skip_tags) 2>&1 ; \
-	elif [ -n ""$(tags)"" ]; then \
+	@if [ -n """$(flags)""" ]; then \
+	        PYTHONPATH=$(PYTHONSRC_INSTALL_PYTHON_PATH):$(GPMGMT_SRC) python $(BEHAVE_BIN) $(GPMGMT_SRC)/test/behave/* -s -k $(flags) 2>&1 ; \
+	elif [ -n """$(tags)""" ]; then \
 	        PYTHONPATH=$(PYTHONSRC_INSTALL_PYTHON_PATH):$(GPMGMT_SRC) python $(BEHAVE_BIN) $(GPMGMT_SRC)/test/behave/* -s -k --tags=$(tags) 2>&1 ; \
 	else \
-	        PYTHONPATH=$(PYTHONSRC_INSTALL_PYTHON_PATH):$(GPMGMT_SRC) python $(BEHAVE_BIN) $(GPMGMT_SRC)/test/behave/* -s 2>&1; \
+	        echo "Please specify tags=tagname or flags=[behave flags]"; \
 	fi
diff --git a/gpMgmt/test/run_behave.sh b/gpMgmt/test/run_behave.sh
index 61f69e981cfbf3ec71f93776b566ca0f1fbf9562..d8e7eee67c5d80ecc7f6d8f3317991e1a8dcdb3a 100755
--- a/gpMgmt/test/run_behave.sh
+++ b/gpMgmt/test/run_behave.sh
@@ -4,4 +4,4 @@ source $HOME/qa.sh
 
 cd $BLDWRAP_TOP/gpMgmt
 
-make -f Makefile.behave behave $@ TAR=tar 2>&1
+make -f Makefile.behave behave "$*" TAR=tar 2>&1