diff --git a/tests/acceptance/features/apiSpaces/listSpaces.feature b/tests/acceptance/features/apiSpaces/listSpaces.feature
index 01458e1003..f92c2b7152 100644
--- a/tests/acceptance/features/apiSpaces/listSpaces.feature
+++ b/tests/acceptance/features/apiSpaces/listSpaces.feature
@@ -54,13 +54,3 @@ Feature: List and create spaces
       | name             | Project Venus |
       | quota@@@total    | 2000          |
       | root@@@webDavUrl | %base_url%/dav/spaces/%space_id% |
-
-  Scenario: Alice creates a folder via the Graph api in space, she expects a 201 code and she checks that folder exists
-    Given the administrator gives "Alice" the role "Admin" using the settings api
-    When user "Alice" creates a space "Project Venus" of type "project" with quota "2000" using the GraphApi
-    And user "Alice" lists all available spaces via the GraphApi
-    And user "Alice" creates a folder "mainFolder" in space "Project Venus" using the WebDav Api
-    Then the HTTP status code should be "201"
-    When user "Alice" lists the content of the space with the name "Project Venus" using the WebDav Api
-    Then the propfind result of the space should contain these entries:
-      | mainFolder/        |
diff --git a/tests/acceptance/features/apiSpaces/uploadSpaces.feature b/tests/acceptance/features/apiSpaces/uploadSpaces.feature
index cd017f30b0..721d5345aa 100644
--- a/tests/acceptance/features/apiSpaces/uploadSpaces.feature
+++ b/tests/acceptance/features/apiSpaces/uploadSpaces.feature
@@ -10,6 +10,27 @@ Feature: Upload files into a space
     Given user "Alice" has been created with default attributes and without skeleton files
     And user "Bob" has been created with default attributes and without skeleton files
 
+  Scenario: Alice creates a folder via the Graph api in space, she expects a 201 code and she checks that folder exists
+    Given the administrator gives "Alice" the role "Admin" using the settings api
+    When user "Alice" creates a space "Project Venus" of type "project" with quota "2000" using the GraphApi
+    And user "Alice" lists all available spaces via the GraphApi
+    And user "Alice" creates a folder "mainFolder" in space "Project Venus" using the WebDav Api
+    Then the HTTP status code should be "201"
+    When user "Alice" lists the content of the space with the name "Project Venus" using the WebDav Api
+    Then the propfind result of the space should contain these entries:
+      | mainFolder        |
+
+  Scenario: Bob creates a folder via the Graph api in a space, he expects a 404 code and
+  Alice checks that this folder does not exist
+    Given the administrator gives "Alice" the role "Admin" using the settings api
+    When user "Alice" creates a space "Project Merkur" of type "project" with quota "2000" using the GraphApi
+    And user "Alice" lists all available spaces via the GraphApi
+    And user "Bob" creates a folder "forAlice" in space "Project Merkur" using the WebDav Api
+    Then the HTTP status code should be "404"
+    When user "Alice" lists the content of the space with the name "Project Merkur" using the WebDav Api
+    Then the propfind result of the space should not contain these entries:
+      | forAlice        |
+
   Scenario: Alice creates a folder via Graph api and uploads a file
     Given the administrator gives "Alice" the role "Admin" using the settings api
     When user "Alice" creates a space "Project Moon" of type "project" with quota "2000" using the GraphApi
@@ -20,9 +41,20 @@ Feature: Upload files into a space
     Then the HTTP status code should be "201"
     When user "Alice" lists the content of the space with the name "Project Moon" using the WebDav Api
     Then the propfind result of the space should contain these entries:
-      | NewFolder/      |
+      | NewFolder        |
       | test.txt         |
 
+  Scenario: Bob uploads a file via the Graph api in a space, he expects a 404 code and
+  Alice checks that this file does not exist
+    Given the administrator gives "Alice" the role "Admin" using the settings api
+    When user "Alice" creates a space "Project Pluto" of type "project" with quota "2000" using the GraphApi
+    And user "Alice" lists all available spaces via the GraphApi
+    And user "Bob" uploads a file inside space "Project Pluto" with content "Test" to "test.txt" using the WebDAV API
+    Then the HTTP status code should be "404"
+    When user "Alice" lists the content of the space with the name "Project Pluto" using the WebDav Api
+    Then the propfind result of the space should not contain these entries:
+      | test.txt        |
+
   Scenario: Alice creates uploads a file and checks her quota
     Given the administrator gives "Alice" the role "Admin" using the settings api
     When user "Alice" creates a space "Project Saturn" of type "project" with quota "2000" using the GraphApi
diff --git a/tests/acceptance/features/bootstrap/SpacesContext.php b/tests/acceptance/features/bootstrap/SpacesContext.php
index 19af029a7e..047c9505ea 100644
--- a/tests/acceptance/features/bootstrap/SpacesContext.php
+++ b/tests/acceptance/features/bootstrap/SpacesContext.php
@@ -595,7 +595,7 @@ class SpacesContext implements Context {
                     "response does not contain the entry '$expectedFile[0]'"
                 );
             } else {
-                Assert::assertFalse(
+                Assert::assertEmpty(
                     $fileFound,
                     "response does contain the entry '$expectedFile[0]' but should not"
                 );
@@ -748,7 +748,6 @@ class SpacesContext implements Context {
                 $content
             )
         );
-        $this->featureContext->theHTTPStatusCodeShouldBe([201, 204]);
     }
 
     /**