diff --git a/tests/acceptance/features/apiProvisioning-v1/disableApp.feature b/tests/acceptance/features/apiProvisioning-v1/disableApp.feature
index 33d1d0c45efd..34f5ff7372fb 100644
--- a/tests/acceptance/features/apiProvisioning-v1/disableApp.feature
+++ b/tests/acceptance/features/apiProvisioning-v1/disableApp.feature
@@ -1,4 +1,4 @@
-@api @provisioning_api-app-required @comments-app-required @skipOnLDAP
+@api @provisioning_api-app-required @app-control @comments-app-required @skipOnLDAP @notToImplementOnOCIS
 Feature: disable an app
   As an admin
   I want to be able to disable an enabled app
@@ -15,7 +15,6 @@ Feature: disable an app
     And the HTTP status code should be "200"
     And app "comments" should be disabled
 
-  @notToImplementOnOCIS
   Scenario: subadmin tries to disable an app
     Given user "subadmin" has been created with default attributes and skeleton files
     And group "brand-new-group" has been created
diff --git a/tests/acceptance/features/apiProvisioning-v1/enableApp.feature b/tests/acceptance/features/apiProvisioning-v1/enableApp.feature
index 3ecdece70cfb..710ad455f3d6 100644
--- a/tests/acceptance/features/apiProvisioning-v1/enableApp.feature
+++ b/tests/acceptance/features/apiProvisioning-v1/enableApp.feature
@@ -1,4 +1,4 @@
-@api @provisioning_api-app-required @comments-app-required @skipOnLDAP
+@api @provisioning_api-app-required @comments-app-required @skipOnLDAP @notToImplementOnOCIS
 Feature: enable an app
   As an admin
   I want to be able to enable a disabled app
@@ -16,7 +16,6 @@ Feature: enable an app
     And app "comments" should be enabled
     And the information for app "comments" should have a valid version
 
-  @notToImplementOnOCIS
   Scenario: subadmin tries to enable an app
     Given user "subadmin" has been created with default attributes and skeleton files
     And group "brand-new-group" has been created
diff --git a/tests/acceptance/features/apiProvisioning-v1/getAppInfo.feature b/tests/acceptance/features/apiProvisioning-v1/getAppInfo.feature
index 8dd2e5978f6b..fdbaffacc1fe 100644
--- a/tests/acceptance/features/apiProvisioning-v1/getAppInfo.feature
+++ b/tests/acceptance/features/apiProvisioning-v1/getAppInfo.feature
@@ -1,4 +1,4 @@
-@api @provisioning_api-app-required @skipOnLDAP
+@api @provisioning_api-app-required @skipOnLDAP @notToImplementOnOCIS
 Feature: get app info
   As an admin
   I want to be able to get app info
diff --git a/tests/acceptance/features/apiProvisioning-v1/getApps.feature b/tests/acceptance/features/apiProvisioning-v1/getApps.feature
index aa34e39591e5..872d2d213de9 100644
--- a/tests/acceptance/features/apiProvisioning-v1/getApps.feature
+++ b/tests/acceptance/features/apiProvisioning-v1/getApps.feature
@@ -1,4 +1,4 @@
-@api @provisioning_api-app-required @files_sharing-app-required @skipOnLDAP
+@api @provisioning_api-app-required @files_sharing-app-required @skipOnLDAP @notToImplementOnOCIS
 Feature: get apps
   As an admin
   I want to be able to get the list of apps on my ownCloud
diff --git a/tests/acceptance/features/apiProvisioning-v1/getSubAdmins.feature b/tests/acceptance/features/apiProvisioning-v1/getSubAdmins.feature
index 91da156dcb65..e982a5e4a3ec 100644
--- a/tests/acceptance/features/apiProvisioning-v1/getSubAdmins.feature
+++ b/tests/acceptance/features/apiProvisioning-v1/getSubAdmins.feature
@@ -1,4 +1,4 @@
-@api @provisioning_api-app-required @skipOnLDAP
+@api @provisioning_api-app-required @skipOnLDAP @notToImplementOnOCIS
 Feature: get subadmins
   As an admin
   I want to be able to get the list of subadmins of a group
@@ -7,7 +7,7 @@ Feature: get subadmins
   Background:
     Given using OCS API version "1"
 
-  @smokeTest @notToImplementOnOCIS
+  @smokeTest
   Scenario: admin gets subadmin users of a group
     Given user "brand-new-user" has been created with default attributes and skeleton files
     And group "brand-new-group" has been created
@@ -26,7 +26,6 @@ Feature: get subadmins
     And the HTTP status code should be "200"
     And the API should not return any data
 
-  @notToImplementOnOCIS
   Scenario: subadmin tries to get other subadmins of the same group
     Given these users have been created with default attributes and skeleton files:
       | username         |
@@ -40,7 +39,6 @@ Feature: get subadmins
     And the HTTP status code should be "401"
     And the API should not return any data
 
-  @notToImplementOnOCIS
   Scenario: normal user tries to get the subadmins of the group
     Given these users have been created with default attributes and skeleton files:
       | username       |
diff --git a/tests/acceptance/features/apiProvisioning-v2/disableApp.feature b/tests/acceptance/features/apiProvisioning-v2/disableApp.feature
index 57d108c80fff..412ce959f1ae 100644
--- a/tests/acceptance/features/apiProvisioning-v2/disableApp.feature
+++ b/tests/acceptance/features/apiProvisioning-v2/disableApp.feature
@@ -1,4 +1,4 @@
-@api @provisioning_api-app-required @comments-app-required @skipOnLDAP
+@api @provisioning_api-app-required @comments-app-required @skipOnLDAP @notToImplementOnOCIS
 Feature: disable an app
   As an admin
   I want to be able to disable an enabled app
@@ -15,7 +15,7 @@ Feature: disable an app
     And the HTTP status code should be "200"
     And app "comments" should be disabled
 
-  @issue-31276 @notToImplementOnOCIS
+  @issue-31276
   Scenario: subadmin tries to disable an app
     Given user "subadmin" has been created with default attributes and skeleton files
     And group "brand-new-group" has been created
diff --git a/tests/acceptance/features/apiProvisioning-v2/enableApp.feature b/tests/acceptance/features/apiProvisioning-v2/enableApp.feature
index d2d97003bf5d..d58cb05a769c 100644
--- a/tests/acceptance/features/apiProvisioning-v2/enableApp.feature
+++ b/tests/acceptance/features/apiProvisioning-v2/enableApp.feature
@@ -1,4 +1,4 @@
-@api @provisioning_api-app-required @comments-app-required @skipOnLDAP
+@api @provisioning_api-app-required @comments-app-required @skipOnLDAP @notToImplementOnOCIS
 Feature: enable an app
   As an admin
   I want to be able to enable a disabled app
@@ -15,7 +15,7 @@ Feature: enable an app
     And the HTTP status code should be "200"
     And app "comments" should be enabled
 
-  @issue-31276 @notToImplementOnOCIS
+  @issue-31276
   Scenario: subadmin tries to enable an app
     Given user "subadmin" has been created with default attributes and skeleton files
     And group "brand-new-group" has been created
diff --git a/tests/acceptance/features/apiProvisioning-v2/getAppInfo.feature b/tests/acceptance/features/apiProvisioning-v2/getAppInfo.feature
index 01487f999730..3c8eba134b2d 100644
--- a/tests/acceptance/features/apiProvisioning-v2/getAppInfo.feature
+++ b/tests/acceptance/features/apiProvisioning-v2/getAppInfo.feature
@@ -1,4 +1,4 @@
-@api @provisioning_api-app-required @skipOnLDAP
+@api @provisioning_api-app-required @skipOnLDAP @notToImplementOnOCIS
 Feature: get app info
   As an admin
   I want to be able to get app info
diff --git a/tests/acceptance/features/apiProvisioning-v2/getApps.feature b/tests/acceptance/features/apiProvisioning-v2/getApps.feature
index 66d2cf4df963..0d53dcbf1d7a 100644
--- a/tests/acceptance/features/apiProvisioning-v2/getApps.feature
+++ b/tests/acceptance/features/apiProvisioning-v2/getApps.feature
@@ -1,4 +1,4 @@
-@api @provisioning_api-app-required @files_sharing-app-required @skipOnLDAP
+@api @provisioning_api-app-required @files_sharing-app-required @skipOnLDAP @notToImplementOnOCIS
 Feature: get apps
   As an admin
   I want to be able to get the list of apps on my ownCloud
diff --git a/tests/acceptance/features/apiProvisioning-v2/getSubAdmins.feature b/tests/acceptance/features/apiProvisioning-v2/getSubAdmins.feature
index 3969e25ddf61..5589959728dd 100644
--- a/tests/acceptance/features/apiProvisioning-v2/getSubAdmins.feature
+++ b/tests/acceptance/features/apiProvisioning-v2/getSubAdmins.feature
@@ -1,4 +1,4 @@
-@api @provisioning_api-app-required @skipOnLDAP
+@api @provisioning_api-app-required @skipOnLDAP @notToImplementOnOCIS
 Feature: get subadmins
   As an admin
   I want to be able to get the list of subadmins of a group
@@ -7,7 +7,7 @@ Feature: get subadmins
   Background:
     Given using OCS API version "2"
 
-  @smokeTest @notToImplementOnOCIS
+  @smokeTest
   Scenario: admin gets subadmin users of a group
     Given user "brand-new-user" has been created with default attributes and skeleton files
     And group "brand-new-group" has been created
@@ -26,7 +26,7 @@ Feature: get subadmins
     And the HTTP status code should be "400"
     And the API should not return any data
 
-  @issue-31276 @notToImplementOnOCIS
+  @issue-31276
   Scenario: subadmin tries to get other subadmins of the same group
     Given these users have been created with default attributes and skeleton files:
       | username         |
@@ -41,7 +41,7 @@ Feature: get subadmins
     And the HTTP status code should be "401"
     And the API should not return any data
 
-  @issue-31276 @notToImplementOnOCIS
+  @issue-31276
   Scenario: normal user tries to get the subadmins of the group
     Given these users have been created with default attributes and skeleton files:
       | username       |