diff --git a/tests/acceptance/features/bootstrap/NotificationContext.php b/tests/acceptance/features/bootstrap/NotificationContext.php
index ac9838562e1df3d3896701669c28feedd7e9a44d..717de4302da5805e1fbf550386c4217bbb668d07 100644
--- a/tests/acceptance/features/bootstrap/NotificationContext.php
+++ b/tests/acceptance/features/bootstrap/NotificationContext.php
@@ -31,7 +31,7 @@ class NotificationContext implements Context, ActorAwareInterface {
 	 * @return Locator
 	 */
 	public static function notificationMessage($message) {
-		return Locator::forThe()->xpath("//*[@class = 'row' and normalize-space() = '$message']")->
+		return Locator::forThe()->xpath("//*[contains(concat(' ', normalize-space(@class), ' '), ' toastify ') and normalize-space(text()) = '$message']")->
 				descendantOf(self::notificationContainer())->
 				describedAs("$message notification");
 	}
@@ -40,7 +40,7 @@ class NotificationContext implements Context, ActorAwareInterface {
 	 * @return Locator
 	 */
 	private static function notificationContainer() {
-		return Locator::forThe()->id("notification-container")->
+		return Locator::forThe()->id("content")->
 				describedAs("Notification container");
 	}