diff --git a/webapp/test/Test.qunit.html b/webapp/test/Test.qunit.html
index 88b2d15fd..83342bcef 100644
--- a/webapp/test/Test.qunit.html
+++ b/webapp/test/Test.qunit.html
@@ -2,11 +2,10 @@
 <html>
 <head>
 	<meta charset="utf-8">
-	<base href="../">
 	<script
-		src="resources/sap/ui/test/starter/runTest.js"
+		src="../resources/sap/ui/test/starter/runTest.js"
 		data-sap-ui-resource-roots='{
-			"test-resources.sap.ui.demo.todo": "./test"
+			"test-resources.sap.ui.demo.todo": "./"
 		}'
 	></script>
 </head>
diff --git a/webapp/test/integration/FilterJourney.js b/webapp/test/integration/FilterJourney.js
index 16a2a695d..5936046dd 100644
--- a/webapp/test/integration/FilterJourney.js
+++ b/webapp/test/integration/FilterJourney.js
@@ -2,7 +2,7 @@
 
 sap.ui.define([
 	"sap/ui/test/opaQunit",
-	"sap/ui/demo/todo/test/integration/pages/App"
+	"./pages/App"
 ], (opaTest) => {
 	"use strict";
 
diff --git a/webapp/test/integration/SearchJourney.js b/webapp/test/integration/SearchJourney.js
index d8d8d2746..17fdfb868 100644
--- a/webapp/test/integration/SearchJourney.js
+++ b/webapp/test/integration/SearchJourney.js
@@ -3,7 +3,7 @@
 sap.ui.define([
 	"sap/ui/Device",
 	"sap/ui/test/opaQunit",
-	"sap/ui/demo/todo/test/integration/pages/App"
+	"./pages/App"
 ], (Device, opaTest) => {
 	"use strict";
 
diff --git a/webapp/test/integration/TodoListJourney.js b/webapp/test/integration/TodoListJourney.js
index 948d99e32..4fbe48e59 100644
--- a/webapp/test/integration/TodoListJourney.js
+++ b/webapp/test/integration/TodoListJourney.js
@@ -2,7 +2,7 @@
 
 sap.ui.define([
 	"sap/ui/test/opaQunit",
-	"sap/ui/demo/todo/test/integration/pages/App"
+	"./pages/App"
 ], (opaTest) => {
 	"use strict";
 
diff --git a/webapp/test/integration/opaTests.qunit.js b/webapp/test/integration/opaTests.qunit.js
index 90dfa5f62..a297c028c 100644
--- a/webapp/test/integration/opaTests.qunit.js
+++ b/webapp/test/integration/opaTests.qunit.js
@@ -1,9 +1,9 @@
 sap.ui.define([
 	"sap/ui/test/Opa5",
-	"sap/ui/demo/todo/test/integration/arrangements/Startup",
-	"sap/ui/demo/todo/test/integration/TodoListJourney",
-	"sap/ui/demo/todo/test/integration/SearchJourney",
-	"sap/ui/demo/todo/test/integration/FilterJourney"
+	"./arrangements/Startup",
+	"./TodoListJourney",
+	"./SearchJourney",
+	"./FilterJourney"
 ], (Opa5, Startup) => {
 	"use strict";
 
diff --git a/webapp/test/testsuite.qunit.html b/webapp/test/testsuite.qunit.html
index 932ddf9f3..c45959d61 100644
--- a/webapp/test/testsuite.qunit.html
+++ b/webapp/test/testsuite.qunit.html
@@ -2,13 +2,12 @@
 <html>
 <head>
 	<meta charset="utf-8">
-	<base href="../">
 	<title>QUnit test suite for Todo App</title>
 	<script
-		src="resources/sap/ui/test/starter/createSuite.js"
+		src="../resources/sap/ui/test/starter/createSuite.js"
 		data-sap-ui-testsuite="test-resources/sap/ui/demo/todo/testsuite.qunit"
 		data-sap-ui-resource-roots='{
-			"test-resources.sap.ui.demo.todo": "./test"
+			"test-resources.sap.ui.demo.todo": "./"
 		}'
 	></script>
 </head>
diff --git a/webapp/test/testsuite.qunit.js b/webapp/test/testsuite.qunit.js
index c4fa533fd..c0a11928d 100644
--- a/webapp/test/testsuite.qunit.js
+++ b/webapp/test/testsuite.qunit.js
@@ -3,7 +3,7 @@ sap.ui.define(function () {
 	return {
 		name: "QUnit test suite for Todo App",
 		defaults: {
-			page: "test/Test.qunit.html?testsuite={suite}&test={name}",
+			page: "ui5://test-resources/sap/ui/demo/todo/Test.qunit.html?testsuite={suite}&test={name}",
 			qunit: {
 				version: 2
 			},
@@ -16,11 +16,11 @@ sap.ui.define(function () {
 			},
 			coverage: {
 				only: "sap/ui/demo/todo/",
-				never: "sap/ui/demo/todo/test/"
+				never: "test-resources/sap/ui/demo/todo/"
 			},
 			loader: {
 				paths: {
-					"sap/ui/demo/todo": "./"
+					"sap/ui/demo/todo": "../"
 				}
 			}
 		},
