diff --git a/tests/acceptance/features/bootstrap/AppsManagementContext.php b/tests/acceptance/features/bootstrap/AppsManagementContext.php
index b989630518297b7d0dbe6135c48376a121b001fb..2fa089e3cbae43edf9653760ead9140668cf2056 100644
--- a/tests/acceptance/features/bootstrap/AppsManagementContext.php
+++ b/tests/acceptance/features/bootstrap/AppsManagementContext.php
@@ -60,7 +60,7 @@ class AppsManagementContext implements Context, ActorAwareInterface {
 	 * @return Locator
 	 */
 	public static function bundleButton($bundle) {
-		return Locator::forThe()->xpath("//div[@id='app-content']//div[@class='apps-header']/h2[normalize-space() = '$bundle']/input")->
+		return Locator::forThe()->xpath("//main[@id='app-content']//div[@class='apps-header']/h2[normalize-space() = '$bundle']/input")->
 		describedAs("Button to enable / disable bundles");
 	}
 
@@ -68,7 +68,7 @@ class AppsManagementContext implements Context, ActorAwareInterface {
 	 * @return Locator
 	 */
 	public static function rowForApp($app) {
-		return Locator::forThe()->xpath("//div[@id='app-content']//div[@class='app-name'][normalize-space() = '$app']/..")->
+		return Locator::forThe()->xpath("//main[@id='app-content']//div[@class='app-name'][normalize-space() = '$app']/..")->
 				describedAs("Row for app $app in Apps Management");
 	}
 
@@ -76,7 +76,7 @@ class AppsManagementContext implements Context, ActorAwareInterface {
 	 * @return Locator
 	 */
 	public static function emptyAppList() {
-		return Locator::forThe()->xpath("//div[@id='app-content']//div[@id='apps-list-empty']")->
+		return Locator::forThe()->xpath("//main[@id='app-content']//div[@id='apps-list-empty']")->
 			describedAs("Empty apps list view");
 	}
 
@@ -84,7 +84,7 @@ class AppsManagementContext implements Context, ActorAwareInterface {
 	 * @return Locator
 	 */
 	public static function appEntries() {
-		return Locator::forThe()->xpath("//div[@id='app-content']//div[@class='section']")->
+		return Locator::forThe()->xpath("//main[@id='app-content']//div[@class='section']")->
 			describedAs("Entries in apps list");
 	}