diff --git a/gpMgmt/test/behave/mgmt_utils/gprecoverseg.feature b/gpMgmt/test/behave/mgmt_utils/gprecoverseg.feature
index 15e9773ecb79679be5baeff041008a74c02fb2d4..7c676572da04967aded4506bf58914a7f7289936 100644
--- a/gpMgmt/test/behave/mgmt_utils/gprecoverseg.feature
+++ b/gpMgmt/test/behave/mgmt_utils/gprecoverseg.feature
@@ -227,3 +227,41 @@ Feature: gprecoverseg tests
         And the segments are synchronized
         # validate the the new segment has the correct setting by getting admin connection to that segment
         Then the saved primary segment reports the same value for sql "show data_checksums" db "template1" as was saved
+
+    @skip  # tablespaces are being reworked and currently do not work with pg_rewind
+    @concourse_cluster
+    Scenario: incremental recovery works with tablespaces on a multi-host environment
+        Given the database is running
+          And a tablespace is created with data
+          And user stops all primary processes
+          And user can start transactions
+         When the user runs "gprecoverseg -a"
+         Then gprecoverseg should return a return code of 0
+          And the segments are synchronized
+          And the tablespace is valid
+
+        Given another tablespace is created with data
+         When the user runs "gprecoverseg -ra"
+         Then gprecoverseg should return a return code of 0
+          And the segments are synchronized
+          And the tablespace is valid
+          And the other tablespace is valid
+
+    @skip  # tablespaces are being reworked and currently do not work with pg_rewind
+    @concourse_cluster
+    Scenario: full recovery works with tablespaces on a multi-host environment
+        Given the database is running
+          And a tablespace is created with data
+          And user stops all primary processes
+          And user can start transactions
+         When the user runs "gprecoverseg -a -F"
+         Then gprecoverseg should return a return code of 0
+          And the segments are synchronized
+          And the tablespace is valid
+
+        Given another tablespace is created with data
+         When the user runs "gprecoverseg -ra"
+         Then gprecoverseg should return a return code of 0
+          And the segments are synchronized
+          And the tablespace is valid
+          And the other tablespace is valid