diff --git a/test/video.mp4 b/test/Cloudron Test Video.mp4
similarity index 100%
rename from test/video.mp4
rename to test/Cloudron Test Video.mp4
diff --git a/test/test.js b/test/test.js
index b3b5501..1fb23ae 100644
--- a/test/test.js
+++ b/test/test.js
@@ -15,15 +15,9 @@ var execSync = require('child_process').execSync,
     expect = require('expect.js'),
     path = require('path'),
     superagent = require('superagent'),
-    webdriver = require('selenium-webdriver'),
-    util = require('util');
-
-var by = webdriver.By,
-    Key = webdriver.Key,
-    until = webdriver.until,
-    Builder = require('selenium-webdriver').Builder;
-
-process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0';
+    util = require('util'),
+    { Builder, By, Key, until } = require('selenium-webdriver'),
+    { Options } = require('selenium-webdriver/chrome');
 
 if (!process.env.USERNAME || !process.env.PASSWORD || !process.env.EMAIL) {
     console.log('USERNAME, EMAIL and PASSWORD env vars need to be set');
@@ -33,30 +27,23 @@ if (!process.env.USERNAME || !process.env.PASSWORD || !process.env.EMAIL) {
 describe('Application life cycle test', function () {
     this.timeout(0);
 
-    var server, browser = new Builder().forBrowser('chrome').build();
+    var LOCATION = 'test';
+    var TEST_TIMEOUT = parseInt(process.env.TEST_TIMEOUT, 10) || 30000;
+
+    var browser;
+    var app;
     var username = process.env.USERNAME;
     var password = process.env.PASSWORD;
     var email = process.env.EMAIL;
 
-    before(function (done) {
-        var seleniumJar= require('selenium-server-standalone-jar');
-        var SeleniumServer = require('selenium-webdriver/remote').SeleniumServer;
-        server = new SeleniumServer(seleniumJar.path, { port: 4444 });
-        server.start();
-
-        done();
+    before(function () {
+        browser = new Builder().forBrowser('chrome').setChromeOptions(new Options().windowSize({ width: 1280, height: 1024 })).build();
     });
 
-    after(function (done) {
+    after(function () {
         browser.quit();
-        server.stop();
-        done();
     });
 
-    var LOCATION = 'test';
-    var TEST_TIMEOUT = parseInt(process.env.TEST_TIMEOUT, 10) || 30000;
-    var app;
-
     function getAppInfo() {
         var inspect = JSON.parse(execSync('cloudron inspect'));
         app = inspect.apps.filter(function (a) { return a.location === LOCATION || a.location === LOCATION + '2'; })[0];
@@ -65,15 +52,15 @@ describe('Application life cycle test', function () {
 
     function login(username, password, done) {
         browser.get('https://' + app.fqdn + '/login').then(function () {
-            return browser.wait(until.elementLocated(by.id('username')), TEST_TIMEOUT);
+            return browser.wait(until.elementLocated(By.id('username')), TEST_TIMEOUT);
         }).then(function () {
-            return browser.findElement(by.id('username')).sendKeys(username);
+            return browser.findElement(By.id('username')).sendKeys(username);
         }).then(function () {
-            return browser.findElement(by.id('password')).sendKeys(password);
+            return browser.findElement(By.id('password')).sendKeys(password);
         }).then(function () {
-            return browser.findElement(by.xpath('//input[@value="Login"]')).click();
+            return browser.findElement(By.xpath('//input[@value="Login"]')).click();
         }).then(function () {
-            return browser.wait(until.elementLocated(by.xpath('//div[contains(text(), "MY LIBRARY")]')), TEST_TIMEOUT);
+            return browser.wait(until.elementLocated(By.xpath('//div[contains(text(), "MY LIBRARY")]')), TEST_TIMEOUT);
         }).then(function () {
             done();
         });
@@ -81,15 +68,17 @@ describe('Application life cycle test', function () {
 
     function logout(done) {
         browser.get('https://' + app.fqdn + '/my-account/videos').then(function () {
-            return browser.wait(until.elementLocated(by.xpath('//a[contains(text(), "My settings")]')), TEST_TIMEOUT);
+            return browser.wait(until.elementLocated(By.xpath('//div[@class="logged-in-display-name"]')), TEST_TIMEOUT);
         }).then(function () {
-            return browser.findElement(by.xpath('//my-global-icon[@class="dropdown-toggle"]')).click();
+            return browser.sleep(2000);
         }).then(function () {
-            return browser.sleep(4000);
+            return browser.findElement(By.xpath('//div[@class="logged-in-display-name"]')).click();
         }).then(function () {
-            return browser.findElement(by.xpath('//a[contains(text(), "Log out")]')).click();
+            return browser.sleep(2000);
         }).then(function () {
-            return browser.sleep(4000);
+            return browser.findElement(By.xpath('//a[contains(text(), "Log out")]')).click();
+        }).then(function () {
+            return browser.sleep(2000);
         }).then(function () {
             done();
         });
@@ -99,20 +88,20 @@ describe('Application life cycle test', function () {
         var button;
 
         browser.get('https://' + app.fqdn + '/admin/config/edit-custom').then(function () {
-            return browser.wait(until.elementLocated(by.xpath('//a[contains(text(), "Configure my instance")]')), TEST_TIMEOUT);
+            return browser.wait(until.elementLocated(By.xpath('//a[contains(text(), "Configure my instance")]')), TEST_TIMEOUT);
         }).then(function () {
-            return browser.findElement(by.xpath('//a[contains(text(), "Configure my instance")]')).click(); // this opens a new window
+            return browser.findElement(By.xpath('//a[contains(text(), "Configure my instance")]')).click(); // this opens a new window
         }).then(function () {
             return browser.get('https://' + app.fqdn + '/admin/config/edit-custom');
         }).then(function () {
-            return browser.wait(until.elementLocated(by.xpath('//input[contains(@value, "Update configuration")]')), TEST_TIMEOUT);
+            return browser.wait(until.elementLocated(By.xpath('//input[contains(@value, "Update configuration")]')), TEST_TIMEOUT);
         }).then(function () {
-            button = browser.findElement(by.xpath('//input[contains(@value, "Update configuration")]'));
+            button = browser.findElement(By.xpath('//input[contains(@value, "Update configuration")]'));
             return browser.executeScript('arguments[0].scrollIntoView(true)', button);
         }).then(function () {
             return button.click();
         }).then(function () {
-            return browser.wait(until.elementLocated(by.xpath('//h3[contains(text(), "Success")]')), TEST_TIMEOUT);
+            return browser.wait(until.elementLocated(By.xpath('//h3[contains(text(), "Success")]')), TEST_TIMEOUT);
         }).then(function () {
             console.log('Close the newly opened tab. Will wait for 20 seconds');
             return browser.sleep(20000);
@@ -123,15 +112,11 @@ describe('Application life cycle test', function () {
 
     function uploadVideo(done) {
         browser.get('https://' + app.fqdn + '/videos/upload').then(function () {
-            return browser.findElement(by.xpath('//input[@id="videofile" and @type="file"]')).sendKeys(path.resolve(__dirname, './video.mp4'));
+            return browser.findElement(By.xpath('//input[@id="videofile" and @type="file"]')).sendKeys(path.resolve(__dirname, './Cloudron Test Video.mp4'));
         }).then(function () {
             return browser.sleep(20000); // wait for upload
         }).then(function () {
-            return browser.findElement(by.xpath('//input[@id="name"]')).sendKeys(Key.chord(Key.CONTROL, 'a'));
-        }).then(function () {
-            return browser.findElement(by.xpath('//input[@id="name"]')).sendKeys('Cloudron Test Video');
-        }).then(function () {
-            return browser.findElement(by.xpath('//span[text()="Publish"]')).click();
+            return browser.findElement(By.xpath('//span[text()="Publish"]')).click();
         }).then(function () {
             return browser.sleep(2000);
         }).then(function () {
@@ -141,7 +126,7 @@ describe('Application life cycle test', function () {
 
     function videoExists(done) {
         browser.get('https://' + app.fqdn + '/my-account/videos').then(function () {
-            return browser.wait(until.elementLocated(by.xpath('//a[@title="Cloudron Test Video"]')), TEST_TIMEOUT);
+            return browser.wait(until.elementLocated(By.xpath('//a[@title="Cloudron Test Video"]')), TEST_TIMEOUT);
         }).then(function () {
             return done();
         });
@@ -158,7 +143,7 @@ describe('Application life cycle test', function () {
 
     it('can get app information', getAppInfo);
 	it('can root login', login.bind(null, 'root', 'changeme'));
-    it('can complete setup', completeSetup);
+    xit('can complete setup', completeSetup);
     it('can upload video', uploadVideo);
     it('video exists', videoExists);
     it('logout', logout);
@@ -242,7 +227,7 @@ describe('Application life cycle test', function () {
     });
 
     it('can get app information', getAppInfo);
-	it('can root login', login.bind(null, 'root', 'changeme'));
+    it('can root login', login.bind(null, 'root', 'changeme'));
     it('can complete setup', completeSetup);
     it('can upload video', uploadVideo);
     it('video exists', videoExists);
@@ -250,7 +235,7 @@ describe('Application life cycle test', function () {
     it('can update', function () {
         execSync('cloudron update --app ' + app.id, { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
     });
-	it('can root login', login.bind(null, 'root', 'changeme'));
+    it('can root login', login.bind(null, 'root', 'changeme'));
     it('video exists', videoExists);
     it('logout', logout);