diff --git a/imports/ui/welcome/welcome.js b/imports/ui/welcome/welcome.js
index 6b0ba453a79415ccefde86e46a78b2779679f7c4..41e88c245830e805f8cfa531d1f2975e8907170b 100644
--- a/imports/ui/welcome/welcome.js
+++ b/imports/ui/welcome/welcome.js
@@ -185,11 +185,11 @@ Template.welcome.helpers({
 			loginButtons += '<a id="BackdoorLogin" href=""><img src="img/backdoor-login.png" alt="use backdoor for' +
 				' login"/></a>';
 			loginButtons += '<span class="btn-group backdoorLogin"><label id="backdoor-label">' + title + ':</label><br><select class="btn btn-secondary btn-raised" id="TestingBackdoorUsername" aria-labelledby="backdoor-label">' +
-				'<option id="adminLogin" value="admin">' + superAdmin + '</option>' +
-				'<option id="editorLogin" value="editor">' + admin + '</option>' +
+				'<option id="superAdminLogin" value="admin">' + superAdmin + '</option>' +
+				'<option id="adminLogin" value="editor">' + admin + '</option>' +
 				'<option id="proLogin" value="pro">' + pro + '</option>' +
 				'<option id="lecturerLogin" value="lecturer">' + Meteor.settings.public.university.default + '-' + lecturer + '</option>' +
-				'<option id="universityLogin" value="university">' + Meteor.settings.public.university.default +  '-' + edu + '</option>' +
+				'<option id="eduLogin" value="university">' + Meteor.settings.public.university.default +  '-' + edu + '</option>' +
 				'<option id="standardLogin" value="standard">' + standard + '</option>' +
 				'<option id="blockedLogin" value="blocked">' + blocked + '</option>' +
 				'<option id="firstLogin" value="firstLogin">' + firstLogin + '</option>' +
diff --git a/tests/features/create-cardset/create-cardset_steps.js b/tests/features/create-cardset/create-cardset_steps.js
index e366d6437c151e2a505b121fcdcb49fe03ef19dc..65e663397f060547e75c11f06c267a1343fb6901 100644
--- a/tests/features/create-cardset/create-cardset_steps.js
+++ b/tests/features/create-cardset/create-cardset_steps.js
@@ -7,7 +7,7 @@ module.exports = function () {
 	let description = "description";
 
 	this.Given(/^User is logged in$/, function () {
-		navigation.login("universityLogin");
+		navigation.login("edu");
 	});
 
 	this.Given(/^User is on the my cardset view$/, function () {
diff --git a/tests/features/create-new-card/create-new-card_steps.js b/tests/features/create-new-card/create-new-card_steps.js
index 64d11e3f7bbfee3dc29e0bd547ccf2943e1915c5..366bc537ab0c56d083bd3292a4d21402a4459d75 100644
--- a/tests/features/create-new-card/create-new-card_steps.js
+++ b/tests/features/create-new-card/create-new-card_steps.js
@@ -11,7 +11,7 @@ module.exports = function () {
 	 * ---------------------------------------------------------------------
 	 */
 	this.Given(/^User is on the poolview with username "standard"$/, function () {
-		navigation.login("universityLogin");
+		navigation.login("edu");
 	});
 	this.Given(/^he is on the view of a cardset$/, function () {
 		navigation.selectMyCardset();
diff --git a/tests/features/learn-cards/learn-cards_steps.js b/tests/features/learn-cards/learn-cards_steps.js
index e9292990e3798efb9f22a51110d9dc6cc093d2fc..2234651c336be23156bf6b929ac4c94d5c5dd87b 100644
--- a/tests/features/learn-cards/learn-cards_steps.js
+++ b/tests/features/learn-cards/learn-cards_steps.js
@@ -7,7 +7,7 @@ module.exports = function () {
 		box5After, box6Before, box6After, card1, card2;
 
 	this.Given(/^I'm logged in$/, function () {
-		navigation.login("universityLogin");
+		navigation.login("edu");
 	});
 
 	this.Then(/^I'm at the leitner statistics to check my progress$/, function () {
diff --git a/tests/features_helper/navigation.js b/tests/features_helper/navigation.js
index da98260fbaa35a42c72d70daebaaf8236a088a71..93b69ba2032dad4b69c240011c852968c8b8845e 100644
--- a/tests/features_helper/navigation.js
+++ b/tests/features_helper/navigation.js
@@ -16,6 +16,7 @@ module.exports = {
 			browser.url(global.baseURL);
 			setResolution();
 			agreeCookies();
+			userLogin += "Login";
 			browser.waitForVisible('#TestingBackdoorUsername', global.threshold);
 			this.clickElement('#TestingBackdoorUsername', global.threshold);
 			browser.waitForVisible('#' + userLogin);
diff --git a/tests/helpers/chimpTest.sh b/tests/helpers/chimpTest.sh
index 0b4e96175f0986a70436807212f38e946bcb5a4e..15b5b517fcd24c6914d428d6f53ad4a2078b536b 100644
--- a/tests/helpers/chimpTest.sh
+++ b/tests/helpers/chimpTest.sh
@@ -16,9 +16,9 @@ if [ -z "$CALLED_FROM_SCRIPT" ] ; then
 fi
 
 if [ -n "$DISPLAY" ] ; then
-        xvfb-run --server-args="-ac -screen 0 1920x1080x24" chimp --ddp=http://localhost:3000 --path=$testDir $1 --browser=firefox
-else
      ./node_modules/.bin/chimp .config/chimp.js --ddp=http://localhost:$PORT --path=$testDir $1 --browser=firefox
+else
+     xvfb-run --server-args="-ac -screen 0 1920x1080x24" chimp --ddp=http://localhost:3000 --path=$testDir $1 --browser=firefox
 fi
 if [ $? -ne 0 ]; then
     failedTests=$((failedTests+1))