diff --git a/js/logger.js b/js/logger.js
index 38185153..7ea12a79 100644
--- a/js/logger.js
+++ b/js/logger.js
@@ -9,12 +9,13 @@
  */
 (function (root, factory) {
 	if (typeof exports === "object") {
-		// add timestamps in front of log messages
-		require("console-stamp")(console, {
-			pattern: "yyyy-mm-dd HH:MM:ss.l",
-			include: ["debug", "log", "info", "warn", "error"]
-		});
-
+		if (process.env.JEST_WORKER_ID === undefined) {
+			// add timestamps in front of log messages
+			require("console-stamp")(console, {
+				pattern: "yyyy-mm-dd HH:MM:ss.l",
+				include: ["debug", "log", "info", "warn", "error"]
+			});
+		}
 		// Node, CommonJS-like
 		module.exports = factory(root.config);
 	} else {
@@ -22,7 +23,9 @@
 		root.Log = factory(root.config);
 	}
 })(this, function (config) {
-	let logLevel = {
+	let logLevel;
+	if ((typeof exports === "object" && process.env.JEST_WORKER_ID === undefined) || typeof exports !== "object") {
+		logLevel = {
 		debug: Function.prototype.bind.call(console.debug, console),
 		log: Function.prototype.bind.call(console.log, console),
 		info: Function.prototype.bind.call(console.info, console),
@@ -32,22 +35,36 @@
 		groupCollapsed: Function.prototype.bind.call(console.groupCollapsed, console),
 		groupEnd: Function.prototype.bind.call(console.groupEnd, console),
 		time: Function.prototype.bind.call(console.time, console),
-		timeEnd: Function.prototype.bind.call(console.timeEnd, console)
-	};
-
-	if ((typeof exports === "object" && process.env.JEST_WORKER_ID === undefined) || typeof exports !== "object") {
-		logLevel.timeStamp = Function.prototype.bind.call(console.timeStamp, console);
-	}
-
-	logLevel.setLogLevel = function (newLevel) {
-		if (newLevel) {
-			Object.keys(logLevel).forEach(function (key, index) {
-				if (!newLevel.includes(key.toLocaleUpperCase())) {
-					logLevel[key] = function () {};
-				}
-			});
+		timeEnd: Function.prototype.bind.call(console.timeEnd, console),
+		timeStamp: Function.prototype.bind.call(console.timeStamp, console)
 		}
-	};
+
+		logLevel.setLogLevel = function (newLevel) {
+			if (newLevel) {
+				Object.keys(logLevel).forEach(function (key, index) {
+					if (!newLevel.includes(key.toLocaleUpperCase())) {
+						logLevel[key] = function () {};
+					}
+				});
+			}
+		};
+	} else {
+		logLevel = {
+			debug: function () {},
+			log: function () {},
+			info: function () {},
+			warn: function () {},
+			error: function () {},
+			group: function () {},
+			groupCollapsed: function () {},
+			groupEnd: function () {},
+			time: function () {},
+			timeEnd: function () {},
+			timeStamp: function () {}
+		};
+
+		logLevel.setLogLevel = function () {};
+	}
 
 	return logLevel;
 });
diff --git a/package.json b/package.json
index 8bda06d8..e48f96f0 100644
--- a/package.json
+++ b/package.json
@@ -123,10 +123,9 @@
 				"testMatch": [
 					"**/tests/e2e/**/*.[jt]s?(x)"
 				],
-				"moduleNameMapper": {
-					"logger": "<rootDir>/js/logger.js",
-					"node_helper": "<rootDir>/js/node_helper.js"
-				}
+				"modulePaths": [
+					"<rootDir>/js/"
+				]
 			}
 		]
 	}
diff --git a/tests/e2e/env_spec.js b/tests/e2e/env_spec.js
index 28a0294b..91e6564a 100644
--- a/tests/e2e/env_spec.js
+++ b/tests/e2e/env_spec.js
@@ -1,5 +1,5 @@
 const fetch = require("node-fetch");
-const app = require("../../js/app.js");
+const app = require("app.js");
 
 describe("Electron app environment", function () {
 	beforeAll(function () {
diff --git a/tests/e2e/fonts.js b/tests/e2e/fonts.js
index d8b8e0a7..81327a87 100644
--- a/tests/e2e/fonts.js
+++ b/tests/e2e/fonts.js
@@ -1,5 +1,5 @@
 const fetch = require("node-fetch");
-const app = require("../../js/app.js");
+const app = require("app.js");
 
 describe("All font files from roboto.css should be downloadable", function () {
 	const fontFiles = [];
diff --git a/tests/e2e/ipWhitelist_spec.js b/tests/e2e/ipWhitelist_spec.js
index 99bad61a..5f90274c 100644
--- a/tests/e2e/ipWhitelist_spec.js
+++ b/tests/e2e/ipWhitelist_spec.js
@@ -1,5 +1,5 @@
 const fetch = require("node-fetch");
-const app = require("../../js/app.js");
+const app = require("app.js");
 
 describe("ipWhitelist directive configuration", function () {
 	beforeAll(function () {
diff --git a/tests/e2e/port_config.js b/tests/e2e/port_config.js
index 7e960992..3e50d347 100644
--- a/tests/e2e/port_config.js
+++ b/tests/e2e/port_config.js
@@ -1,5 +1,5 @@
 const fetch = require("node-fetch");
-const app = require("../../js/app.js");
+const app = require("app.js");
 
 describe("port directive configuration", function () {
 	beforeAll(function () {
diff --git a/tests/e2e/vendor_spec.js b/tests/e2e/vendor_spec.js
index 2b619dd0..1aef4de7 100644
--- a/tests/e2e/vendor_spec.js
+++ b/tests/e2e/vendor_spec.js
@@ -1,5 +1,5 @@
 const fetch = require("node-fetch");
-const app = require("../../js/app.js");
+const app = require("app.js");
 
 describe("Vendors", function () {
 	beforeAll(function () {