diff --git a/tests/acceptance/features/apiSharingNg1/enableDisablePermissionsRole.feature b/tests/acceptance/features/apiSharingNg1/enableDisablePermissionsRole.feature
new file mode 100644
index 000000000..36168f595
--- /dev/null
+++ b/tests/acceptance/features/apiSharingNg1/enableDisablePermissionsRole.feature
@@ -0,0 +1,401 @@
+@env-config
+Feature: enable disable permissions role
+  As a user
+  I want to enable/disable permissions role on shared resources
+  So that I can control the accessibility of shared resources to sharee
+
+  Background:
+    Given these users have been created with default attributes:
+      | username |
+      | Alice    |
+      | Brian    |
+
+
+  Scenario Outline: users list the shares shared with Secure Viewer after the role is disabled (Personal Space)
+    Given the administrator has enabled the permissions role "Secure Viewer"
+    And user "Alice" has uploaded file with content "some content" to "textfile.txt"
+    And user "Alice" has created folder "folderToShare"
+    And user "Alice" has sent the following resource share invitation:
+      | resource        | <resource>    |
+      | space           | Personal      |
+      | sharee          | Brian         |
+      | shareType       | user          |
+      | permissionsRole | Secure Viewer |
+    And user "Brian" has a share "<resource>" synced
+    And the administrator has disabled the permissions role "Secure Viewer"
+    When user "Alice" lists the shares shared by her using the Graph API
+    Then the HTTP status code should be "200"
+    And the JSON data of the response should contain resource "<resource>" with the following data:
+      """
+      {
+        "type": "object",
+        "required": [
+          "parentReference",
+          "permissions",
+          "name"
+        ],
+        "properties": {
+          "permissions": {
+            "type": "array",
+            "minItems": 1,
+            "maxItems": 1,
+            "items": {
+              "type": "object",
+              "required": [
+                "@libre.graph.permissions.actions",
+                "grantedToV2",
+                "id",
+                "invitation"
+              ],
+              "properties": {
+                "@libre.graph.permissions.actions": {
+                  "const": [
+                      "libre.graph/driveItem/path/read",
+                      "libre.graph/driveItem/children/read",
+                      "libre.graph/driveItem/basic/read"
+                  ]
+                },
+                "roles": { "const": null }
+              }
+            }
+          }
+        }
+      }
+      """
+    When user "Brian" lists the shares shared with him using the Graph API
+    Then the HTTP status code should be "200"
+    And the JSON data of the response should match
+      """
+      {
+        "type": "object",
+        "required": ["value"],
+        "properties": {
+          "value": {
+            "type": "array",
+            "minItems": 1,
+            "maxItems": 1,
+            "items": {
+              "type": "object",
+              "required": [
+                "@UI.Hidden",
+                "@client.synchronize",
+                "createdBy",
+                "eTag",
+                "<resource-type>",
+                "id",
+                "lastModifiedDateTime",
+                "name",
+                "parentReference",
+                "remoteItem"
+              ],
+              "properties": {
+                "remoteItem": {
+                  "type": "object",
+                  "required": [
+                    "createdBy",
+                    "eTag",
+                    "<resource-type>",
+                    "id",
+                    "lastModifiedDateTime",
+                    "name",
+                    "parentReference",
+                    "permissions"
+                  ],
+                  "properties": {
+                    "name": { "const": "<resource>" },
+                    "permissions": {
+                      "type": "array",
+                      "minItems": 1,
+                      "maxItems": 1,
+                      "items": {
+                        "type": "object",
+                        "required": [
+                          "@libre.graph.permissions.actions",
+                          "grantedToV2",
+                          "id",
+                          "invitation"
+                        ],
+                        "properties": {
+                          "@libre.graph.permissions.actions": {
+                            "const": [
+                                "libre.graph/driveItem/path/read",
+                                "libre.graph/driveItem/children/read",
+                                "libre.graph/driveItem/basic/read"
+                            ]
+                          },
+                          "roles": { "const": null }
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+      """
+    Examples:
+      | resource      | resource-type |
+      | textfile.txt  | file          |
+      | folderToShare | folder        |
+
+
+  Scenario: users list the shares shared with Denied after the role is disabled (Personal Space)
+    Given the administrator has enabled the permissions role "Denied"
+    And user "Alice" has created folder "folderToShare"
+    And user "Alice" has sent the following resource share invitation:
+      | resource        | folderToShare |
+      | space           | Personal      |
+      | sharee          | Brian         |
+      | shareType       | user          |
+      | permissionsRole | Denied        |
+    And the administrator has disabled the permissions role "Denied"
+    When user "Alice" lists the shares shared by her using the Graph API
+    Then the HTTP status code should be "200"
+    And the JSON data of the response should contain resource "folderToShare" with the following data:
+      """
+      {
+        "type": "object",
+        "required": [
+          "parentReference",
+          "permissions",
+          "name"
+        ],
+        "properties": {
+          "permissions": {
+            "type": "array",
+            "minItems": 1,
+            "maxItems": 1,
+            "items": {
+              "type": "object",
+              "required": [
+                "@libre.graph.permissions.actions",
+                "grantedToV2",
+                "id",
+                "invitation"
+              ],
+              "properties": {
+                "@libre.graph.permissions.actions": {
+                  "const": ["none"]
+                },
+                "roles": { "const": null }
+              }
+            }
+          }
+        }
+      }
+      """
+    When user "Brian" lists the shares shared with him using the Graph API
+    Then the HTTP status code should be "200"
+    And the JSON data of the response should match
+      """
+      {
+        "type": "object",
+        "required": ["value"],
+        "properties": {
+          "value": {
+            "type": "array",
+            "minItems": 0,
+            "maxItems": 0
+          }
+        }
+      }
+      """
+
+
+  Scenario Outline: users list the shares shared with Secure Viewer after the role is disabled (Project Space)
+    Given using spaces DAV path
+    And the administrator has enabled the permissions role "Secure Viewer"
+    And the administrator has assigned the role "Space Admin" to user "Alice" using the Graph API
+    And user "Alice" has created a space "new-space" with the default quota using the Graph API
+    And user "Alice" has uploaded a file inside space "new-space" with content "some content" to "textfile.txt"
+    And user "Alice" has created a folder "folderToShare" in space "new-space"
+    And user "Alice" has sent the following resource share invitation:
+      | resource        | <resource>    |
+      | space           | new-space     |
+      | sharee          | Brian         |
+      | shareType       | user          |
+      | permissionsRole | Secure Viewer |
+    And user "Brian" has a share "<resource>" synced
+    And the administrator has disabled the permissions role "Secure Viewer"
+    When user "Alice" lists the shares shared by her using the Graph API
+    Then the HTTP status code should be "200"
+    And the JSON data of the response should contain resource "<resource>" with the following data:
+      """
+      {
+        "type": "object",
+        "required": [
+          "parentReference",
+          "permissions",
+          "name"
+        ],
+        "properties": {
+          "permissions": {
+            "type": "array",
+            "minItems": 1,
+            "maxItems": 1,
+            "items": {
+              "type": "object",
+              "required": [
+                "@libre.graph.permissions.actions",
+                "grantedToV2",
+                "id",
+                "invitation"
+              ],
+              "properties": {
+                "@libre.graph.permissions.actions": {
+                  "const": [
+                      "libre.graph/driveItem/path/read",
+                      "libre.graph/driveItem/children/read",
+                      "libre.graph/driveItem/basic/read"
+                  ]
+                },
+                "roles": { "const": null }
+              }
+            }
+          }
+        }
+      }
+      """
+    When user "Brian" lists the shares shared with him using the Graph API
+    Then the HTTP status code should be "200"
+    And the JSON data of the response should match
+      """
+      {
+        "type": "object",
+        "required": ["value"],
+        "properties": {
+          "value": {
+            "type": "array",
+            "minItems": 1,
+            "maxItems": 1,
+            "items": {
+              "type": "object",
+              "required": [
+                "@UI.Hidden",
+                "@client.synchronize",
+                "eTag",
+                "<resource-type>",
+                "id",
+                "lastModifiedDateTime",
+                "name",
+                "parentReference",
+                "remoteItem"
+              ],
+              "properties": {
+                "remoteItem": {
+                  "type": "object",
+                  "required": [
+                    "eTag",
+                    "<resource-type>",
+                    "id",
+                    "lastModifiedDateTime",
+                    "name",
+                    "parentReference",
+                    "permissions"
+                  ],
+                  "properties": {
+                    "name": { "const": "<resource>" },
+                    "permissions": {
+                      "type": "array",
+                      "minItems": 1,
+                      "maxItems": 1,
+                      "items": {
+                        "type": "object",
+                        "required": [
+                          "@libre.graph.permissions.actions",
+                          "grantedToV2",
+                          "id",
+                          "invitation"
+                        ],
+                        "properties": {
+                          "@libre.graph.permissions.actions": {
+                            "const": [
+                                "libre.graph/driveItem/path/read",
+                                "libre.graph/driveItem/children/read",
+                                "libre.graph/driveItem/basic/read"
+                            ]
+                          },
+                          "roles": { "const": null }
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+      """
+    Examples:
+      | resource      | resource-type |
+      | textfile.txt  | file          |
+      | folderToShare | folder        |
+
+
+  Scenario: users list the shares shared with Denied after the role is disabled (Project Space)
+    Given using spaces DAV path
+    And the administrator has enabled the permissions role "Denied"
+    And the administrator has assigned the role "Space Admin" to user "Alice" using the Graph API
+    And user "Alice" has created a space "new-space" with the default quota using the Graph API
+    And user "Alice" has created a folder "folderToShare" in space "new-space"
+    And user "Alice" has sent the following resource share invitation:
+      | resource        | folderToShare |
+      | space           | new-space     |
+      | sharee          | Brian         |
+      | shareType       | user          |
+      | permissionsRole | Denied        |
+    And the administrator has disabled the permissions role "Denied"
+    When user "Alice" lists the shares shared by her using the Graph API
+    Then the HTTP status code should be "200"
+    And the JSON data of the response should contain resource "folderToShare" with the following data:
+      """
+      {
+        "type": "object",
+        "required": [
+          "parentReference",
+          "permissions",
+          "name"
+        ],
+        "properties": {
+          "permissions": {
+            "type": "array",
+            "minItems": 1,
+            "maxItems": 1,
+            "items": {
+              "type": "object",
+              "required": [
+                "@libre.graph.permissions.actions",
+                "grantedToV2",
+                "id",
+                "invitation"
+              ],
+              "properties": {
+                "@libre.graph.permissions.actions": {
+                  "const": ["none"]
+                },
+                "roles": { "const": null }
+              }
+            }
+          }
+        }
+      }
+      """
+    When user "Brian" lists the shares shared with him using the Graph API
+    Then the HTTP status code should be "200"
+    And the JSON data of the response should match
+      """
+      {
+        "type": "object",
+        "required": ["value"],
+        "properties": {
+          "value": {
+            "type": "array",
+            "minItems": 0,
+            "maxItems": 0
+          }
+        }
+      }
+      """
diff --git a/tests/acceptance/features/apiSharingNg1/sharedByMe.feature b/tests/acceptance/features/apiSharingNg1/sharedByMe.feature
index ad4df2407..71c85b51e 100644
--- a/tests/acceptance/features/apiSharingNg1/sharedByMe.feature
+++ b/tests/acceptance/features/apiSharingNg1/sharedByMe.feature
@@ -3863,217 +3863,3 @@ Feature: resources shared by user
         }
       }
       """
-
-  @env-config
-  Scenario Outline: sharer lists the shares shared with Secure Viewer after the role is disabled (Personal Space)
-    Given the administrator has enabled the permissions role "Secure Viewer"
-    And user "Alice" has uploaded file with content "some content" to "textfile.txt"
-    And user "Alice" has created folder "folderToShare"
-    And user "Alice" has sent the following resource share invitation:
-      | resource        | <resource>    |
-      | space           | Personal      |
-      | sharee          | Brian         |
-      | shareType       | user          |
-      | permissionsRole | Secure Viewer |
-    And user "Brian" has a share "<resource>" synced
-    And the administrator has disabled the permissions role "Secure Viewer"
-    When user "Alice" lists the shares shared by her using the Graph API
-    Then the HTTP status code should be "200"
-    And the JSON data of the response should contain resource "<resource>" with the following data:
-      """
-      {
-        "type": "object",
-        "required": [
-          "parentReference",
-          "permissions",
-          "name"
-        ],
-        "properties": {
-          "permissions": {
-            "type": "array",
-            "minItems": 1,
-            "maxItems": 1,
-            "items": {
-              "type": "object",
-              "required": [
-                "@libre.graph.permissions.actions",
-                "grantedToV2",
-                "id",
-                "invitation"
-              ],
-              "properties": {
-                "@libre.graph.permissions.actions": {
-                  "const": [
-                      "libre.graph/driveItem/path/read",
-                      "libre.graph/driveItem/children/read",
-                      "libre.graph/driveItem/basic/read"
-                  ]
-                },
-                "roles": { "const": null }
-              }
-            }
-          }
-        }
-      }
-      """
-    Examples:
-      | resource      |
-      | textfile.txt  |
-      | folderToShare |
-
-  @env-config
-  Scenario: sharer lists the shares shared with Denied after the role is disabled (Personal Space)
-    Given the administrator has enabled the permissions role "Denied"
-    And user "Alice" has created folder "folderToShare"
-    And user "Alice" has sent the following resource share invitation:
-      | resource        | folderToShare |
-      | space           | Personal      |
-      | sharee          | Brian         |
-      | shareType       | user          |
-      | permissionsRole | Denied        |
-    And the administrator has disabled the permissions role "Denied"
-    When user "Alice" lists the shares shared by her using the Graph API
-    Then the HTTP status code should be "200"
-    And the JSON data of the response should contain resource "folderToShare" with the following data:
-      """
-      {
-        "type": "object",
-        "required": [
-          "parentReference",
-          "permissions",
-          "name"
-        ],
-        "properties": {
-          "permissions": {
-            "type": "array",
-            "minItems": 1,
-            "maxItems": 1,
-            "items": {
-              "type": "object",
-              "required": [
-                "@libre.graph.permissions.actions",
-                "grantedToV2",
-                "id",
-                "invitation"
-              ],
-              "properties": {
-                "@libre.graph.permissions.actions": {
-                  "const": ["none"]
-                },
-                "roles": { "const": null }
-              }
-            }
-          }
-        }
-      }
-      """
-
-  @env-config
-  Scenario Outline: sharer lists the shares shared with Secure Viewer after the role is disabled (Project Space)
-    Given using spaces DAV path
-    And the administrator has enabled the permissions role "Secure Viewer"
-    And the administrator has assigned the role "Space Admin" to user "Alice" using the Graph API
-    And user "Alice" has created a space "new-space" with the default quota using the Graph API
-    And user "Alice" has uploaded a file inside space "new-space" with content "some content" to "textfile.txt"
-    And user "Alice" has created a folder "folderToShare" in space "new-space"
-    And user "Alice" has sent the following resource share invitation:
-      | resource        | <resource>    |
-      | space           | new-space     |
-      | sharee          | Brian         |
-      | shareType       | user          |
-      | permissionsRole | Secure Viewer |
-    And user "Brian" has a share "<resource>" synced
-    And the administrator has disabled the permissions role "Secure Viewer"
-    When user "Alice" lists the shares shared by her using the Graph API
-    Then the HTTP status code should be "200"
-    And the JSON data of the response should contain resource "<resource>" with the following data:
-      """
-      {
-        "type": "object",
-        "required": [
-          "parentReference",
-          "permissions",
-          "name"
-        ],
-        "properties": {
-          "permissions": {
-            "type": "array",
-            "minItems": 1,
-            "maxItems": 1,
-            "items": {
-              "type": "object",
-              "required": [
-                "@libre.graph.permissions.actions",
-                "grantedToV2",
-                "id",
-                "invitation"
-              ],
-              "properties": {
-                "@libre.graph.permissions.actions": {
-                  "const": [
-                      "libre.graph/driveItem/path/read",
-                      "libre.graph/driveItem/children/read",
-                      "libre.graph/driveItem/basic/read"
-                  ]
-                },
-                "roles": { "const": null }
-              }
-            }
-          }
-        }
-      }
-      """
-    Examples:
-      | resource      |
-      | textfile.txt  |
-      | folderToShare |
-
-  @env-config
-  Scenario: sharer lists the shares shared with Denied after the role is disabled (Project Space)
-    Given using spaces DAV path
-    And the administrator has enabled the permissions role "Denied"
-    And the administrator has assigned the role "Space Admin" to user "Alice" using the Graph API
-    And user "Alice" has created a space "new-space" with the default quota using the Graph API
-    And user "Alice" has created a folder "folderToShare" in space "new-space"
-    And user "Alice" has sent the following resource share invitation:
-      | resource        | folderToShare |
-      | space           | new-space     |
-      | sharee          | Brian         |
-      | shareType       | user          |
-      | permissionsRole | Denied        |
-    And the administrator has disabled the permissions role "Denied"
-    When user "Alice" lists the shares shared by her using the Graph API
-    Then the HTTP status code should be "200"
-    And the JSON data of the response should contain resource "folderToShare" with the following data:
-      """
-      {
-        "type": "object",
-        "required": [
-          "parentReference",
-          "permissions",
-          "name"
-        ],
-        "properties": {
-          "permissions": {
-            "type": "array",
-            "minItems": 1,
-            "maxItems": 1,
-            "items": {
-              "type": "object",
-              "required": [
-                "@libre.graph.permissions.actions",
-                "grantedToV2",
-                "id",
-                "invitation"
-              ],
-              "properties": {
-                "@libre.graph.permissions.actions": {
-                  "const": ["none"]
-                },
-                "roles": { "const": null }
-              }
-            }
-          }
-        }
-      }
-      """