diff --git a/concourse/pipelines/templates/gpdb-tpl.yml b/concourse/pipelines/templates/gpdb-tpl.yml
index 46d86e828f698c04f5d7758937a4d9eb331e97b0..04291999e54d81c0d6413df99472b8732ff48434 100644
--- a/concourse/pipelines/templates/gpdb-tpl.yml
+++ b/concourse/pipelines/templates/gpdb-tpl.yml
@@ -1,8 +1,7 @@
 
 {% set CLI_1_suites = ['gprecoverseg',
                       'gpcheckcat',
-                      'gpinitstandby',
-                      'gpactivatestandby'] %}
+                      'gpinitstandby'] %}
 
 {% set gppkg_additional_task = "
         - task: setup_gppkg_second_install
@@ -27,7 +26,9 @@
                       {'name': 'gpstate',
                        'use_concourse_cluster': false},
                       {'name': 'replication_slots',
-                       'use_concourse_cluster': false}
+                       'use_concourse_cluster': false},
+                      {'name': 'gpactivatestandby',
+                       'use_concourse_cluster': true}
                     ] %}
 
 ## ======================================================================
diff --git a/gpMgmt/test/behave/mgmt_utils/gpactivatestandby.feature b/gpMgmt/test/behave/mgmt_utils/gpactivatestandby.feature
index 188bf9069cc8649abfff9b57be15cbc63c47fd4e..fedbb9735d847e2816bf664285b0a5ae8901db70 100644
--- a/gpMgmt/test/behave/mgmt_utils/gpactivatestandby.feature
+++ b/gpMgmt/test/behave/mgmt_utils/gpactivatestandby.feature
@@ -1,5 +1,12 @@
 @gpactivatestandby
 Feature: gpactivatestandby
+
+################### @demo_cluster & @concourse_cluster tests ###################
+# The @concourse_cluster tag denotes the scenario that requires a remote cluster
+# The @demo_cluster tag denotes the scenario can run locally
+
+    @concourse_cluster
+    @demo_cluster
     Scenario: gpactivatestandby works
         Given the database is running
         And the standby is not initialized
@@ -15,6 +22,10 @@ Feature: gpactivatestandby
         And verify that gpstart on original master fails due to lower Timeline ID
         And clean up and revert back to original master
 
+########################### @demo_cluster tests ###########################
+# The @demo_cluster tag denotes the scenario can run locally
+
+    @demo_cluster
     Scenario: gpactivatestandby -f forces standby master to start
         Given the database is running
         And the standby is not initialized
@@ -33,6 +44,7 @@ Feature: gpactivatestandby
         And verify that gpstart on original master fails due to lower Timeline ID
         And clean up and revert back to original master
 
+    @demo_cluster
     Scenario: gpactivatestandby should fail when given invalid data directory
         Given the database is running
         And the standby is not initialized
@@ -42,6 +54,7 @@ Feature: gpactivatestandby
         And the user runs gpactivatestandby with options "-d invalid_directory"
         Then gpactivatestandby should return a return code of 2
 
+    @demo_cluster
     Scenario: gpstate after running gpactivatestandby works
         Given the database is running
         And the standby is not initialized