diff --git a/tests/acceptance/features/webUIFavorites/favoritesFile.feature b/tests/acceptance/features/webUIFavorites/favoritesFile.feature
index dcfbd85f7c43..2a118f9384eb 100644
--- a/tests/acceptance/features/webUIFavorites/favoritesFile.feature
+++ b/tests/acceptance/features/webUIFavorites/favoritesFile.feature
@@ -5,13 +5,13 @@ Feature: Mark file as favorite
   I would like to mark any file/folder as favorite
   So that I can find my favorite file/folder easily
 
-  Background:
-    Given user "user1" has been created with default attributes and skeleton files
-    And user "user1" has logged in using the webUI
-    And the user has browsed to the files page
-
   @smokeTest
   Scenario: mark a file as favorite and list it in favorites page
+    Given user "user1" has been created with default attributes and without skeleton files
+    And user "user1" has uploaded file "filesForUpload/data.zip" to "/data.zip"
+    And user "user1" has uploaded file "filesForUpload/lorem.txt" to "/lorem.txt"
+    And user "user1" has logged in using the webUI
+    And the user has browsed to the files page
     When the user marks file "data.zip" as favorite using the webUI
     Then file "data.zip" should be marked as favorite on the webUI
     When the user reloads the current page of the webUI
@@ -20,6 +20,11 @@ Feature: Mark file as favorite
     And file "lorem.txt" should not be listed in the favorites page on the webUI
 
   Scenario: mark a folder as favorite and list it in favorites page
+    Given user "user1" has been created with default attributes and without skeleton files
+    And user "user1" has created folder "/simple-folder"
+    And user "user1" has created folder "/simple-folder/simple-empty-folder"
+    And user "user1" has logged in using the webUI
+    And the user has browsed to the files page
     When the user marks folder "simple-folder" as favorite using the webUI
     Then folder "simple-folder" should be marked as favorite on the webUI
     When the user reloads the current page of the webUI
@@ -28,6 +33,9 @@ Feature: Mark file as favorite
     And folder "simple-empty-folder" should not be listed in the favorites page on the webUI
 
   Scenario: mark files with same name and different path as favorites and list them in favourites page
+    Given user "user1" has been created with default attributes and skeleton files
+    And user "user1" has logged in using the webUI
+    And the user has browsed to the files page
     When the user marks file "lorem.txt" as favorite using the webUI
     And the user marks folder "simple-empty-folder" as favorite using the webUI
     And the user opens folder "simple-folder" using the webUI
@@ -40,4 +48,4 @@ Feature: Mark file as favorite
     And file "lorem.txt" with path "/simple-folder" should be listed in the favorites page on the webUI
     And folder "simple-empty-folder" with path "/" should be listed in the favorites page on the webUI
     And file "simple-empty-folder" with path "/simple-folder" should be listed in the favorites page on the webUI
-    And file "lorem.txt" with path "/strängé नेपाली folder" should be listed in the favorites page on the webUI
\ No newline at end of file
+    And file "lorem.txt" with path "/strängé नेपाली folder" should be listed in the favorites page on the webUI
diff --git a/tests/acceptance/features/webUIFavorites/unfavoriteFile.feature b/tests/acceptance/features/webUIFavorites/unfavoriteFile.feature
index 4b6adc33e2b2..7a7d92428684 100644
--- a/tests/acceptance/features/webUIFavorites/unfavoriteFile.feature
+++ b/tests/acceptance/features/webUIFavorites/unfavoriteFile.feature
@@ -6,7 +6,9 @@ Feature: Unmark file/folder as favorite
   So that I can remove my favorite file/folder from favorite page
 
   Background:
-    Given user "user1" has been created with default attributes and skeleton files
+    Given user "user1" has been created with default attributes and without skeleton files
+    And user "user1" has uploaded file "filesForUpload/data.zip" to "/data.zip"
+    And user "user1" has created folder "/simple-folder"
     And user "user1" has logged in using the webUI
     And the user has browsed to the files page
 
@@ -35,11 +37,11 @@ Feature: Unmark file/folder as favorite
     When the user browses to the files page
     Then file "data.zip" should not be marked as favorite on the webUI
 
-  Scenario: unmark a folder as favorite from files page
+  Scenario: unmark a folder as favorite from favorite page
     Given the user has marked folder "simple-folder" as favorite using the webUI
     And the user has browsed to the favorites page
     When the user unmarks the favorited folder "simple-folder" using the webUI
     And the user reloads the current page of the webUI
     Then folder "simple-folder" should not be listed in the favorites page on the webUI
     When the user browses to the files page
-    Then folder "simple-folder" should not be marked as favorite on the webUI
\ No newline at end of file
+    Then folder "simple-folder" should not be marked as favorite on the webUI