diff --git a/res/test/e2e/control/control-spec.js b/res/test/e2e/control/control-spec.js
index 26e32884..4baad3fe 100644
--- a/res/test/e2e/control/control-spec.js
+++ b/res/test/e2e/control/control-spec.js
@@ -4,7 +4,7 @@ describe('Control Page', function () {
 
   var ControlPage = function () {
     this.get = function () {
-      browser.get(protractor.getInstance().baseUrl + 'control')
+      browser.get(browser.baseUrl + 'control')
     }
     this.kickDeviceButton = element.all(by.css('.kick-device')).first()
     this.kickDevice = function () {
@@ -27,7 +27,7 @@ describe('Control Page', function () {
     browser.sleep(500)
 
     browser.getLocationAbsUrl().then(function (newUrl) {
-      expect(newUrl).toMatch(protractor.getInstance().baseUrl + 'control')
+      expect(newUrl).toMatch(browser.baseUrl + 'control')
     })
   })
 
@@ -138,7 +138,7 @@ describe('Control Page', function () {
     waitUrl(/devices/)
 
     browser.getLocationAbsUrl().then(function (newUrl) {
-      expect(newUrl).toBe(protractor.getInstance().baseUrl + 'devices')
+      expect(newUrl).toBe(browser.baseUrl + 'devices')
     })
   })
 
diff --git a/res/test/e2e/devices/devices-spec.js b/res/test/e2e/devices/devices-spec.js
index 41bf2a40..ac33cd5a 100644
--- a/res/test/e2e/devices/devices-spec.js
+++ b/res/test/e2e/devices/devices-spec.js
@@ -7,7 +7,7 @@ describe('Device Page', function () {
     it('should go to Devices List page', function () {
       deviceListPage.get()
       browser.getLocationAbsUrl().then(function (newUrl) {
-        expect(newUrl).toBe(protractor.getInstance().baseUrl + 'devices')
+        expect(newUrl).toBe(browser.baseUrl + 'devices')
       })
     })
 
diff --git a/res/test/e2e/devices/index.js b/res/test/e2e/devices/index.js
index 3ed274d7..ef195f5b 100644
--- a/res/test/e2e/devices/index.js
+++ b/res/test/e2e/devices/index.js
@@ -1,7 +1,7 @@
 module.exports = function DeviceListPage() {
   this.get = function () {
     // TODO: Let's get rid off the login first
-    browser.get(protractor.getInstance().baseUrl + 'devices')
+    browser.get(browser.baseUrl + 'devices')
   }
   this.devices = element(by.model('tracker.devices'))
   this.devicesByCss = element.all(by.css('ul.devices-icon-view > li'))
diff --git a/res/test/e2e/help/help-spec.js b/res/test/e2e/help/help-spec.js
index ff9bdab2..5c22fd32 100644
--- a/res/test/e2e/help/help-spec.js
+++ b/res/test/e2e/help/help-spec.js
@@ -1,7 +1,7 @@
 describe('Help Page', function () {
   //var HelpPage = function () {
   //  this.get = function () {
-  //    browser.get(protractor.getInstance().baseUrl + 'help')
+  //    browser.get(browser.baseUrl + 'help')
   //  }
   //}
 })
diff --git a/res/test/e2e/login/index.js b/res/test/e2e/login/index.js
index 63016534..7f3270c0 100644
--- a/res/test/e2e/login/index.js
+++ b/res/test/e2e/login/index.js
@@ -1,5 +1,5 @@
 module.exports = function LoginPage() {
-  this.login = protractor.getInstance().params.login
+  this.login = browser.params.login
 
   this.get = function () {
     return browser.get(this.login.url)
diff --git a/res/test/e2e/login/login-spec.js b/res/test/e2e/login/login-spec.js
index 778022e7..ae1682ed 100644
--- a/res/test/e2e/login/login-spec.js
+++ b/res/test/e2e/login/login-spec.js
@@ -9,7 +9,7 @@ describe('Login Page', function () {
   it('should login with method: "' + loginPage.login.method + '"', function () {
     loginPage.doLogin().then(function () {
       browser.getLocationAbsUrl().then(function (newUrl) {
-        expect(newUrl).toBe(protractor.getInstance().baseUrl + 'devices')
+        expect(newUrl).toBe(browser.baseUrl + 'devices')
       })
     })
   })
diff --git a/res/test/e2e/settings/settings-spec.js b/res/test/e2e/settings/settings-spec.js
index eb510292..3cde0934 100644
--- a/res/test/e2e/settings/settings-spec.js
+++ b/res/test/e2e/settings/settings-spec.js
@@ -1,7 +1,7 @@
 describe('Settings Page', function () {
   //var SettingsPage = function () {
   //  this.get = function () {
-  //    browser.get(protractor.getInstance().baseUrl + 'settings')
+  //    browser.get(browser.baseUrl + 'settings')
   //  }
   //}
 })
diff --git a/res/test/protractor.conf.js b/res/test/protractor.conf.js
index e12a153e..d165c0c5 100644
--- a/res/test/protractor.conf.js
+++ b/res/test/protractor.conf.js
@@ -17,7 +17,7 @@ module.exports.config = {
   params: {
     login: {
       url: process.env.STF_LOGINURL || process.env.STF_URL ||
-      'http://localhost:7120',
+      'http://localhost:7100',
       username: process.env.STF_USERNAME || 'test_user',
       email: process.env.STF_EMAIL || 'test_user@login.local',
       password: process.env.STF_PASSWORD,