diff --git a/tests/acceptance/features/app-files.feature b/tests/acceptance/features/app-files.feature
index 8d32508513..c968ae53ce 100644
--- a/tests/acceptance/features/app-files.feature
+++ b/tests/acceptance/features/app-files.feature
@@ -68,3 +68,22 @@ Feature: app-files
     And I see that the "Sharing" tab in the details view is eventually loaded
     When I open the input field for tags in the details view
     Then I see that the input field for tags in the details view is shown
+
+  Scenario: marking a file as favorite causes the file list to be sorted again
+    Given I am logged in
+    And I create a new folder named "A name alphabetically lower than welcome.txt"
+    And I see that "A name alphabetically lower than welcome.txt" precedes "welcome.txt" in the file list
+    When I mark "welcome.txt" as favorite
+    Then I see that "welcome.txt" is marked as favorite
+    And I see that "welcome.txt" precedes "A name alphabetically lower than welcome.txt" in the file list
+
+  Scenario: unmarking a file as favorite causes the file list to be sorted again
+    Given I am logged in
+    And I create a new folder named "A name alphabetically lower than welcome.txt"
+    And I see that "A name alphabetically lower than welcome.txt" precedes "welcome.txt" in the file list
+    And I mark "welcome.txt" as favorite
+    And I see that "welcome.txt" is marked as favorite
+    And I see that "welcome.txt" precedes "A name alphabetically lower than welcome.txt" in the file list
+    When I unmark "welcome.txt" as favorite
+    Then I see that "welcome.txt" is not marked as favorite
+    And I see that "A name alphabetically lower than welcome.txt" precedes "welcome.txt" in the file list
diff --git a/tests/acceptance/features/bootstrap/FilesAppContext.php b/tests/acceptance/features/bootstrap/FilesAppContext.php
index 52f69c6679..631eb60393 100644
--- a/tests/acceptance/features/bootstrap/FilesAppContext.php
+++ b/tests/acceptance/features/bootstrap/FilesAppContext.php
@@ -213,6 +213,40 @@ class FilesAppContext implements Context, ActorAwareInterface {
 				describedAs("Password protect working icon in the details view in Files app");
 	}
 
+	/**
+	 * @return Locator
+	 */
+	public static function createMenuButton() {
+		return Locator::forThe()->css("#controls .button.new")->
+				descendantOf(self::currentSectionMainView())->
+				describedAs("Create menu button in Files app");
+	}
+
+	/**
+	 * @return Locator
+	 */
+	public static function createNewFolderMenuItem() {
+		return self::createMenuItemFor("New folder");
+	}
+
+	/**
+	 * @return Locator
+	 */
+	public static function createNewFolderMenuItemNameInput() {
+		return Locator::forThe()->css(".filenameform input")->
+				descendantOf(self::createNewFolderMenuItem())->
+				describedAs("Name input in create new folder menu item in Files app");
+	}
+
+	/**
+	 * @return Locator
+	 */
+	private static function createMenuItemFor($newType) {
+		return Locator::forThe()->xpath("//div[contains(concat(' ', normalize-space(@class), ' '), ' newFileMenu ')]//span[normalize-space() = '$newType']/ancestor::li")->
+				descendantOf(self::currentSectionMainView())->
+				describedAs("Create $newType menu item in Files app");
+	}
+
 	/**
 	 * @return Locator
 	 */
@@ -222,6 +256,15 @@ class FilesAppContext implements Context, ActorAwareInterface {
 				describedAs("Row for file $fileName in Files app");
 	}
 
+	/**
+	 * @return Locator
+	 */
+	public static function rowForFilePreceding($fileName1, $fileName2) {
+		return Locator::forThe()->xpath("//preceding-sibling::tr//span[contains(concat(' ', normalize-space(@class), ' '), ' nametext ') and normalize-space() = '$fileName1']/ancestor::tr")->
+				descendantOf(self::rowForFile($fileName2))->
+				describedAs("Row for file $fileName1 preceding $fileName2 in Files app");
+	}
+
 	/**
 	 * @return Locator
 	 */
@@ -230,6 +273,14 @@ class FilesAppContext implements Context, ActorAwareInterface {
 				describedAs("Favorite action for file $fileName in Files app");
 	}
 
+	/**
+	 * @return Locator
+	 */
+	public static function notFavoritedStateIconForFile($fileName) {
+		return Locator::forThe()->css(".icon-star")->descendantOf(self::favoriteActionForFile($fileName))->
+				describedAs("Not favorited state icon for file $fileName in Files app");
+	}
+
 	/**
 	 * @return Locator
 	 */
@@ -293,6 +344,16 @@ class FilesAppContext implements Context, ActorAwareInterface {
 				describedAs($itemText . " item in file actions menu in Files app");
 	}
 
+	/**
+	 * @Given I create a new folder named :folderName
+	 */
+	public function iCreateANewFolderNamed($folderName) {
+		$this->actor->find(self::createMenuButton(), 10)->click();
+
+		$this->actor->find(self::createNewFolderMenuItem(), 2)->click();
+		$this->actor->find(self::createNewFolderMenuItemNameInput(), 2)->setValue($folderName . "\r");
+	}
+
 	/**
 	 * @Given I open the :section section
 	 */
@@ -327,6 +388,17 @@ class FilesAppContext implements Context, ActorAwareInterface {
 	 * @Given I mark :fileName as favorite
 	 */
 	public function iMarkAsFavorite($fileName) {
+		$this->iSeeThatIsNotMarkedAsFavorite($fileName);
+
+		$this->actor->find(self::favoriteActionForFile($fileName), 10)->click();
+	}
+
+	/**
+	 * @Given I unmark :fileName as favorite
+	 */
+	public function iUnmarkAsFavorite($fileName) {
+		$this->iSeeThatIsMarkedAsFavorite($fileName);
+
 		$this->actor->find(self::favoriteActionForFile($fileName), 10)->click();
 	}
 
@@ -413,6 +485,13 @@ class FilesAppContext implements Context, ActorAwareInterface {
 		}
 	}
 
+	/**
+	 * @Then I see that :fileName1 precedes :fileName2 in the file list
+	 */
+	public function iSeeThatPrecedesInTheFileList($fileName1, $fileName2) {
+		PHPUnit_Framework_Assert::assertNotNull($this->actor->find(self::rowForFilePreceding($fileName1, $fileName2), 10));
+	}
+
 	/**
 	 * @Then I see that :fileName is marked as favorite
 	 */
@@ -420,6 +499,13 @@ class FilesAppContext implements Context, ActorAwareInterface {
 		PHPUnit_Framework_Assert::assertNotNull($this->actor->find(self::favoritedStateIconForFile($fileName), 10));
 	}
 
+	/**
+	 * @Then I see that :fileName is not marked as favorite
+	 */
+	public function iSeeThatIsNotMarkedAsFavorite($fileName) {
+		PHPUnit_Framework_Assert::assertNotNull($this->actor->find(self::notFavoritedStateIconForFile($fileName), 10));
+	}
+
 	/**
 	 * @Then I see that the input field for tags in the details view is shown
 	 */