diff --git a/tests/acceptance/features/bootstrap/LoginPageContext.php b/tests/acceptance/features/bootstrap/LoginPageContext.php
index bf44d31fb033d..08046c6e3a3d3 100644
--- a/tests/acceptance/features/bootstrap/LoginPageContext.php
+++ b/tests/acceptance/features/bootstrap/LoginPageContext.php
@@ -91,7 +91,7 @@ public function iLogInWithUserAndPassword($user, $password) {
 	 */
 	public function iSeeThatTheCurrentPageIsTheLoginPage() {
 		PHPUnit_Framework_Assert::assertStringStartsWith(
-				$this->actor->locatePath("/login"),
+				$this->actor->locatePath("/login?redirect_url=/index.php/apps/files"),
 				$this->actor->getSession()->getCurrentUrl());
 	}
 
diff --git a/tests/acceptance/installAndConfigureServer.sh b/tests/acceptance/installAndConfigureServer.sh
index d24405fa448f7..99d51e951afd1 100755
--- a/tests/acceptance/installAndConfigureServer.sh
+++ b/tests/acceptance/installAndConfigureServer.sh
@@ -39,6 +39,8 @@ OC_PASS=123456acb php occ user:add --password-from-env user1
 OC_PASS=123456acb php occ user:add --password-from-env disabledUser
 php occ user:disable disabledUser
 
+php occ app:disable dashboard
+
 if [ "$NEXTCLOUD_SERVER_DOMAIN" != "" ]; then
 	# Default first trusted domain is "localhost"; replace it with given domain.
 	php occ config:system:set trusted_domains 0 --value="$NEXTCLOUD_SERVER_DOMAIN"