diff --git a/ocis/tests/acceptance/features/apiOcisSpecific/apiAuthOcs-ocsPOSTAuth.feature b/ocis/tests/acceptance/features/apiOcisSpecific/apiAuthOcs-ocsPOSTAuth.feature
index e8614a0f6f..70551de80a 100644
--- a/ocis/tests/acceptance/features/apiOcisSpecific/apiAuthOcs-ocsPOSTAuth.feature
+++ b/ocis/tests/acceptance/features/apiOcisSpecific/apiAuthOcs-ocsPOSTAuth.feature
@@ -28,31 +28,16 @@ Feature: auth
     Then the HTTP status code of responses on all endpoints should be "401"
     And the OCS status code of responses on all endpoints should be "notset"
 
-  # after fixing all issues delete this Scenario and use the one from oC10 core
-  Scenario: send POST requests to OCS endpoints as normal user with wrong password
-    When user "Alice" requests these endpoints with "POST" including body "doesnotmatter" using password "invalid" about user "Alice"
-      | endpoint                |
-      | /ocs/v1.php/cloud/users |
-      | /ocs/v2.php/cloud/users |
-    Then the HTTP status code of responses on all endpoints should be "401"
-    And the OCS status code of responses on all endpoints should be "997"
-
-  @issue-ocis-reva-30
-  # after fixing all issues delete this Scenario and use the one from oC10 core
-  Scenario: send POST requests to OCS endpoints as normal user with wrong password
-    When user "Alice" requests these endpoints with "POST" including body "doesnotmatter" using password "invalid" about user "Alice"
-      | endpoint                                  |
-      | /ocs/v1.php/cloud/users/%username%/groups |
-      | /ocs/v2.php/cloud/users/%username%/groups |
-    Then the HTTP status code of responses on all endpoints should be "401"
-    And the OCS status code of responses on all endpoints should be "997"
-
   @issue-ocis-reva-30
   # after fixing all issues delete this Scenario and use the one from oC10 core
   Scenario: send POST requests to OCS endpoints as normal user with wrong password
     When user "Alice" requests these endpoints with "POST" including body "doesnotmatter" using password "invalid" about user "Alice"
       | endpoint                                     |
+      | /ocs/v1.php/cloud/users                      |
+      | /ocs/v2.php/cloud/users                      |
+      | /ocs/v1.php/cloud/users/%username%/groups    |
+      | /ocs/v2.php/cloud/users/%username%/groups    |
       | /ocs/v1.php/cloud/users/%username%/subadmins |
       | /ocs/v2.php/cloud/users/%username%/subadmins |
     Then the HTTP status code of responses on all endpoints should be "401"
-    And the OCS status code of responses on all endpoints should be "997"
+    And the OCS status code of responses on all endpoints should be "notset"
diff --git a/ocis/tests/acceptance/features/apiOcisSpecific/apiAuthOcs-ocsPUTAuth.feature b/ocis/tests/acceptance/features/apiOcisSpecific/apiAuthOcs-ocsPUTAuth.feature
index 64de76d180..13448ea000 100644
--- a/ocis/tests/acceptance/features/apiOcisSpecific/apiAuthOcs-ocsPUTAuth.feature
+++ b/ocis/tests/acceptance/features/apiOcisSpecific/apiAuthOcs-ocsPUTAuth.feature
@@ -9,20 +9,11 @@ Feature: auth
       | endpoint                                         |
       | /ocs/v1.php/apps/files_sharing/api/v1/shares/123 |
       | /ocs/v2.php/apps/files_sharing/api/v1/shares/123 |
+      | /ocs/v1.php/cloud/users/%username%               |
+      | /ocs/v2.php/cloud/users/%username%               |
     Then the HTTP status code of responses on all endpoints should be "401"
     And the OCS status code of responses on all endpoints should be "notset"
 
-  @issue-ocis-reva-30
-  @issue-ocis-ocs-26
-  # after fixing all issues delete this Scenario and use the one from oC10 core
-  Scenario: send PUT request to OCS endpoints as admin with wrong password
-    When the administrator requests these endpoints with "PUT" with body "doesnotmatter" using password "invalid" about user "Alice"
-      | endpoint                           |
-      | /ocs/v1.php/cloud/users/%username% |
-      | /ocs/v2.php/cloud/users/%username% |
-    Then the HTTP status code of responses on all endpoints should be "401"
-    And the OCS status code of responses on all endpoints should be "997"
-
   @issue-ocis-reva-30
   @issue-ocis-ocs-28
   # after fixing all issues delete this Scenario and use the one from oC10 core
@@ -34,5 +25,5 @@ Feature: auth
       | /ocs/v1.php/cloud/users/%username%/enable  |
       | /ocs/v2.php/cloud/users/%username%/enable  |
     Then the HTTP status code of responses on all endpoints should be "401"
-    And the OCS status code of responses on all endpoints should be "997"
+    And the OCS status code of responses on all endpoints should be "notset"
 
diff --git a/ocis/tests/acceptance/features/apiOcisSpecific/apiAuthWebDav-webDavPROPFINDAuth.feature b/ocis/tests/acceptance/features/apiOcisSpecific/apiAuthWebDav-webDavPROPFINDAuth.feature
index 75353a7a9c..478ab74660 100644
--- a/ocis/tests/acceptance/features/apiOcisSpecific/apiAuthWebDav-webDavPROPFINDAuth.feature
+++ b/ocis/tests/acceptance/features/apiOcisSpecific/apiAuthWebDav-webDavPROPFINDAuth.feature
@@ -17,4 +17,4 @@ Feature: get file info using PROPFIND
       | /remote.php/dav/files/%username%/textfile0.txt     |
       | /remote.php/dav/files/%username%/PARENT            |
       | /remote.php/dav/files/%username%/PARENT/parent.txt |
-    Then the HTTP status code of responses on all endpoints should be "404"
+    Then the HTTP status code of responses on all endpoints should be "207"