diff --git a/concourse/pipelines/gpdb_master-generated.yml b/concourse/pipelines/gpdb_master-generated.yml
index 28a442b6a09cb962d0e049db0ffaceaa38373245..e205d390511e4b837261debc83fda37e639c943a 100644
--- a/concourse/pipelines/gpdb_master-generated.yml
+++ b/concourse/pipelines/gpdb_master-generated.yml
@@ -12,7 +12,7 @@
 ## file (example: templates/gpdb-tpl.yml) and regenerate the pipeline
 ## using appropriate tool (example: gen_pipeline.py -t prod).
 ## ----------------------------------------------------------------------
-## Generated by gen_pipeline.py at: 2019-04-22 11:39:53.092437
+## Generated by gen_pipeline.py at: 2019-04-22 12:03:57.214092
 ## Template file: gpdb-tpl.yml
 ## OS Types: ['centos6', 'centos7', 'sles', 'win', 'ubuntu16']
 ## Test Sections: ['ICW', 'Replication', 'ResourceGroups', 'Interconnect', 'CLI', 'UD', 'Extensions', 'Gpperfmon']
@@ -1623,6 +1623,34 @@ jobs:
         passed: [gate_cli_start]
       - get: gpdb6-centos6-test
     - aggregate:
+      - do:
+        - get: gpdb_binary
+          resource: bin_gpdb_centos6
+          passed: [gate_cli_start]
+          trigger: true
+        - get: ccp_src
+        - get: ccp-image
+        - put: terraform
+          params:
+            <<: *ccp_default_params
+            vars:
+              <<: *ccp_default_vars
+              
+        - task: gen_cluster
+          file: ccp_src/ci/tasks/gen_cluster.yml
+          params:
+            <<: *ccp_gen_cluster_default_params
+        - task: gpinitsystem
+          file: ccp_src/ci/tasks/gpinitsystem.yml
+        - task: gpactivatestandby_concourse_cluster_tests
+          file: gpdb_src/concourse/tasks/run_behave.yml
+          image: ccp-image
+          params:
+            BEHAVE_FLAGS: --tags=gpactivatestandby --tags=concourse_cluster
+          on_success:
+            <<: *ccp_destroy
+          ensure:
+            <<: *set_failed
       - do:
         - get: bin_gpdb
           resource: bin_gpdb_centos6
diff --git a/concourse/pipelines/templates/gpdb-tpl.yml b/concourse/pipelines/templates/gpdb-tpl.yml
index 2c241ff6c6bee3eaf2715c1fa2e401c196af19c5..80cd82773887aef25ae308fb8f1b81295da97d4b 100644
--- a/concourse/pipelines/templates/gpdb-tpl.yml
+++ b/concourse/pipelines/templates/gpdb-tpl.yml
@@ -15,7 +15,7 @@
                       {'name': 'replication_slots',
                        'use_concourse_cluster': false},
                       {'name': 'gpactivatestandby',
-                       'use_concourse_cluster': false},
+                       'use_concourse_cluster': true},
                       {'name': 'gpinitstandby',
                        'use_concourse_cluster': false},
                       {'name': 'gpcheckcat',
diff --git a/gpMgmt/test/behave/mgmt_utils/gpactivatestandby.feature b/gpMgmt/test/behave/mgmt_utils/gpactivatestandby.feature
index 29285125223a3013fdc0ca9e869b930e28053775..db4f2df47bcec1395793842169a7c2ca60e60daf 100644
--- a/gpMgmt/test/behave/mgmt_utils/gpactivatestandby.feature
+++ b/gpMgmt/test/behave/mgmt_utils/gpactivatestandby.feature
@@ -68,9 +68,29 @@ Feature: gpactivatestandby
          When the user runs gpinitstandby with options " "
          Then gpinitstandby should return a return code of 0
           And verify the standby master entries in catalog
+
+         When the master goes down
+         Then the user runs gpactivatestandby with options " "
+          And gpactivatestandby should return a return code of 0
+          And verify the standby master is now acting as master
+          And the tablespace is valid on the standby master
+          And clean up and revert back to original master
+
+########################### @concourse_cluster tests ###########################
+# The @concourse_cluster tag denotes the scenario that requires a remote cluster
+
+    @concourse_cluster
+    Scenario: tablespaces work on a multi-host environment
+        Given the database is running
+          And the standby is not initialized
+          And a tablespace is created with data
+         When the user runs gpinitstandby with options " "
+         Then gpinitstandby should return a return code of 0
+          And verify the standby master entries in catalog
+
          When the master goes down
-          And the user runs gpactivatestandby with options " "
-         Then gpactivatestandby should return a return code of 0
+         Then the user runs gpactivatestandby with options " "
+          And gpactivatestandby should return a return code of 0
           And verify the standby master is now acting as master
           And the tablespace is valid on the standby master
           And clean up and revert back to original master