From d1357933939be5bc86db42865072a791b96ebbcd Mon Sep 17 00:00:00 2001
From: Matthias Osswald <mat.osswald@sap.com>
Date: Tue, 23 Jun 2026 11:29:44 +0200
Subject: [PATCH] feat!: Remove testRunner middleware

The QUnit TestRunner (`testrunner.html`, `testrunner.css`,
`TestRunner.js`) is now provided by the UI5 framework (`sap.ui.core`).

All supported UI5 releases ship the relevant testrunner resources,
so the dedicated middleware is no longer needed.

JIRA: CPOUI5FOUNDATION-1158
---
 internal/documentation/docs/pages/Server.md   |   8 +-
 .../documentation/docs/updates/migrate-v5.md  |  11 +-
 packages/server/REUSE.toml                    |   5 -
 packages/server/eslint.config.js              |   7 -
 .../lib/middleware/MiddlewareManager.js       |  94 ++-
 .../lib/middleware/middlewareRepository.js    |   1 -
 packages/server/lib/middleware/testRunner.js  |  62 --
 .../lib/middleware/testRunner/TestRunner.js   | 674 ------------------
 .../lib/middleware/testRunner/testrunner.css  |  81 ---
 .../lib/middleware/testRunner/testrunner.html | 310 --------
 packages/server/nyc.config.js                 |   3 -
 packages/server/package.json                  |   1 -
 .../scripts/update-testRunner-resources.sh    |  28 -
 packages/server/test/lib/server/main.js       |   9 +-
 .../server/middleware/MiddlewareManager.js    | 214 +++++-
 .../test/lib/server/middleware/testRunner.js  | 122 ----
 16 files changed, 261 insertions(+), 1369 deletions(-)
 delete mode 100644 packages/server/lib/middleware/testRunner.js
 delete mode 100644 packages/server/lib/middleware/testRunner/TestRunner.js
 delete mode 100644 packages/server/lib/middleware/testRunner/testrunner.css
 delete mode 100644 packages/server/lib/middleware/testRunner/testrunner.html
 delete mode 100755 packages/server/scripts/update-testRunner-resources.sh
 delete mode 100644 packages/server/test/lib/server/middleware/testRunner.js

diff --git a/internal/documentation/docs/pages/Server.md b/internal/documentation/docs/pages/Server.md
index 3900de4ee72..5382121f102 100644
--- a/internal/documentation/docs/pages/Server.md
+++ b/internal/documentation/docs/pages/Server.md
@@ -28,7 +28,9 @@ Please be aware of the following risks when using the server:
 ::: info Removed Middleware
 The `serveThemes` middleware has been removed in UI5 CLI v5. Theme compilation is now handled by the `buildThemes` build task, which pre-compiles all theme CSS files. The resulting CSS files (including `library.css`, `library-RTL.css`, `library-parameters.json`, and CSS Variables resources) are served via the `serveResources` middleware, providing the same functionality with better performance through build-time compilation and caching.
 
-Custom middleware previously referencing `serveThemes` via `beforeMiddleware` or `afterMiddleware` will continue to work with automatic remapping and a deprecation warning. See the [v5 migration guide](../updates/migrate-v5.md) for details.
+The `testRunner` middleware has also been removed in UI5 CLI v5. The QUnit TestRunner (`testrunner.html`, `testrunner.css`, `TestRunner.js`) is now provided by the UI5 framework (`sap.ui.core`) and is served via the `serveResources` middleware.
+
+Custom middleware previously referencing `serveThemes` or `testRunner` via `beforeMiddleware` or `afterMiddleware` will continue to work with automatic remapping and a deprecation warning. See the [v5 migration guide](../updates/migrate-v5.md) for details.
 :::
 
 All available standard middleware are listed below in the order of their execution.
@@ -43,7 +45,6 @@ A project can also add custom middleware to the server by using the [Custom Serv
 | `liveReloadClient` | See chapter [liveReload](#livereload) |
 | `discovery` |  See chapter [discovery](#discovery) |
 | `serveResources` | See chapter [serveResources](#serveresources) |
-| `testRunner` | See chapter [testRunner](#testrunner) |
 | `versionInfo` | See chapter [versionInfo](#versioninfo)  |
 | `nonReadRequests` | See chapter [nonReadRequests](#nonreadrequests)  |
 | `serveIndex` | See chapter [serveIndex](#serveindex)  |
@@ -105,9 +106,6 @@ The following file content transformations are executed:
 - Escaping non-ASCII characters in `.properties` translation files based on a project's [configuration](./Configuration.md#encoding-of-properties-files)
 - Enhancing the `manifest.json` with supported locales determined by available `.properties` [translation files](./Builder.md#generation-of-supported-locales)
 
-### testRunner
-Serves a static version of the UI5 QUnit TestRunner at `/test-resources/sap/ui/qunit/testrunner.html`.
-
 ### versionInfo
 Generates and serves the version info file `/resources/sap-ui-version.json`, which is required for several framework functionalities.
 
diff --git a/internal/documentation/docs/updates/migrate-v5.md b/internal/documentation/docs/updates/migrate-v5.md
index 0b735e36608..21a97e1ff62 100644
--- a/internal/documentation/docs/updates/migrate-v5.md
+++ b/internal/documentation/docs/updates/migrate-v5.md
@@ -19,6 +19,7 @@ Or update your global install via: `npm i --global @ui5/cli@next`
 
 - **@ui5/server: Live Reload is enabled by default for `ui5 serve`**
 
+- **@ui5/server: Standard middleware `serveThemes` and `testRunner` have been removed**
 
 ## Node.js and npm Version Support
 
@@ -268,21 +269,23 @@ If your project uses a custom middleware that provides live reload functionality
 The following middleware has been removed from the [standard middlewares list](../pages/Server.md#standard-middleware):
 
 * `serveThemes` — The `buildThemes` build task now handles theme compilation (LESS to CSS). Because server sessions now also perform builds, this task runs during a server start instead of on demand during runtime. The resulting CSS files are served by the `serveResources` middleware. This change improves performance through build-time compilation and caching while maintaining the same functionality.
+* `testRunner` — The UI5 QUnit TestRunner resources (`testrunner.html`, `testrunner.css`, `TestRunner.js`) are now provided by the UI5 framework (`sap.ui.core`) and served via the `serveResources` middleware. All supported UI5 releases ship the relevant testrunner resources, so the dedicated middleware is no longer needed.
 
 **Backward Compatibility:**
-If your project or any custom middleware references a removed middleware via `beforeMiddleware` or `afterMiddleware`, UI5 CLI will automatically remap the reference to the nearest remaining middleware and log a deprecation warning. Your custom middleware will still be executed in the expected order.
+If your project or any custom middleware references a removed middleware via `beforeMiddleware` or `afterMiddleware`, UI5 CLI keeps a no-op placeholder in the middleware execution order at the original slot. The custom middleware is executed in the same position as before and a deprecation warning is logged.
 
 **What Changed:**
 - Theme CSS files (`library.css`, `library-RTL.css`, etc.) are now **pre-built**
-- Files are served via `serveResources` instead of being compiled on demand
-- The same CSS files are available at the same URLs as before
+- Theme files are served via `serveResources` instead of being compiled on demand
+- TestRunner resources are served via `serveResources` from the UI5 framework instead of being shipped with UI5 CLI
 
 **Recommended Action:**
 Update your `ui5.yaml` configuration to reference an existing middleware instead.
 
 | Removed Middleware | Replacement Behavior | Recommended `afterMiddleware` |
 | ------------------ | -------------------- | ----------------------------- |
-| `serveThemes`      | CSS files pre-built by `buildThemes` task and served via `serveResources` | `testRunner` |
+| `serveThemes`      | CSS files pre-built by `buildThemes` task and served via `serveResources` | `serveResources` |
+| `testRunner`       | TestRunner resources served via `serveResources` from the UI5 framework | `serveResources` |
 
 ## Learn More
 
diff --git a/packages/server/REUSE.toml b/packages/server/REUSE.toml
index b4233a3d79d..43e6c6253ca 100644
--- a/packages/server/REUSE.toml
+++ b/packages/server/REUSE.toml
@@ -16,8 +16,3 @@ precedence = "aggregate"
 SPDX-FileCopyrightText = ["2010 Sencha Inc.", "2011 LearnBoost", "2011 TJ Holowaychuk", "2014-2015 Douglas Christopher Wilson"]
 SPDX-License-Identifier = "MIT"
 
-[[annotations]]
-path = "lib/middleware/testRunner/**"
-precedence = "aggregate"
-SPDX-FileCopyrightText = "2026 SAP SE or an SAP affiliate company and OpenUI5 contributors"
-SPDX-License-Identifier = "Apache-2.0"
diff --git a/packages/server/eslint.config.js b/packages/server/eslint.config.js
index 436d653b035..d4a5c181426 100644
--- a/packages/server/eslint.config.js
+++ b/packages/server/eslint.config.js
@@ -3,13 +3,6 @@ import eslintCommonConfig from "../../eslint.common.config.js";
 
 export default [
 	...eslintCommonConfig, // Load common ESLint config
-	{
-		// Add project-specific ESLint config rules here
-		// in order to override common config
-		ignores: [
-			"lib/middleware/testRunner/",
-		]
-	},
 	{
 		// Live reload client script runs in the browser, not Node.js
 		files: ["lib/liveReload/client.js"],
diff --git a/packages/server/lib/middleware/MiddlewareManager.js b/packages/server/lib/middleware/MiddlewareManager.js
index 55f315f546e..f4c651a8f22 100644
--- a/packages/server/lib/middleware/MiddlewareManager.js
+++ b/packages/server/lib/middleware/MiddlewareManager.js
@@ -4,15 +4,6 @@ import {getLogger} from "@ui5/logger";
 const hasOwn = Function.prototype.call.bind(Object.prototype.hasOwnProperty);
 const log = getLogger("server:MiddlewareManager");
 
-/**
- * Mapping of removed standard middleware names to their predecessor and successor
- * in the original execution order. Used to remap custom middleware references
- * to the nearest remaining middleware when a removed middleware is referenced.
- */
-const LEGACY_MIDDLEWARE_MAPPING = {
-	serveThemes: {before: "testRunner", after: "versionInfo"}
-};
-
 /**
  * @private
  * @typedef {object} MiddlewareResources
@@ -49,6 +40,7 @@ class MiddlewareManager {
 
 		this.middleware = Object.create(null);
 		this.middlewareExecutionOrder = [];
+		this.legacyMiddlewarePlaceholders = new Set();
 		this.middlewareUtil = new MiddlewareUtil({graph, project: rootProject});
 	}
 
@@ -64,10 +56,15 @@ class MiddlewareManager {
 		await this.addStandardMiddleware();
 		await this.addCustomMiddleware();
 
-		return this.middlewareExecutionOrder.map((name) => {
-			const m = this.middleware[name];
-			app.use(m.mountPath, m.middleware);
-		});
+		// Strip legacy placeholders for removed standard middlewares — they only existed
+		// in middlewareExecutionOrder to preserve slots for custom beforeMiddleware /
+		// afterMiddleware references and are not backed by an actual middleware.
+		return this.middlewareExecutionOrder
+			.filter((name) => !this.legacyMiddlewarePlaceholders.has(name))
+			.map((name) => {
+				const m = this.middleware[name];
+				app.use(m.mountPath, m.middleware);
+			});
 	}
 
 	/**
@@ -86,7 +83,7 @@ class MiddlewareManager {
 		customMiddleware, wrapperCallback, mountPath = "/",
 		beforeMiddleware, afterMiddleware
 	} = {}) {
-		if (this.middleware[middlewareName]) {
+		if (this.#isMiddlewareNameKnown(middlewareName)) {
 			throw new Error(`A middleware with the name ${middlewareName} has already been added`);
 		}
 
@@ -107,8 +104,7 @@ class MiddlewareManager {
 		}
 
 		if (beforeMiddleware || afterMiddleware) {
-			let refMiddlewareName = beforeMiddleware || afterMiddleware;
-			const originalRefMiddlewareName = refMiddlewareName; // Store original before any remapping
+			const refMiddlewareName = beforeMiddleware || afterMiddleware;
 			let refMiddlewareIdx = this.middlewareExecutionOrder.indexOf(refMiddlewareName);
 
 			if (refMiddlewareName === "connectUi5Proxy") {
@@ -119,33 +115,23 @@ class MiddlewareManager {
 					`Please see the migration guide at https://ui5.github.io/cli/updates/migrate-v3/`);
 			}
 
-			// Handle legacy middleware with graceful fallback
-			const legacyMapping = LEGACY_MIDDLEWARE_MAPPING[refMiddlewareName];
-			if (legacyMapping) {
-				// Replace with the appropriate fallback based on reference type
-				refMiddlewareName = afterMiddleware ? legacyMapping.before : legacyMapping.after;
-
+			// Warn when a removed standard middleware is referenced. The reference still resolves
+			// because the removed middleware is kept as a placeholder in middlewareExecutionOrder
+			// (see #addLegacyMiddlewarePlaceholder), preserving the original execution slot.
+			if (this.legacyMiddlewarePlaceholders.has(refMiddlewareName)) {
 				log.warn(
-					`Standard middleware "${originalRefMiddlewareName}" has been removed. ` +
+					`Standard middleware "${refMiddlewareName}" has been removed. ` +
 					`Custom middleware "${middlewareName}" defined in project ` +
-					`"${this.middlewareUtil.getProject()}" references it and ` +
-					`is now placed ${afterMiddleware ? "after" : "before"} ` +
-					`"${refMiddlewareName}" instead. ` +
+					`"${this.middlewareUtil.getProject()}" still references it. ` +
+					`The custom middleware will be executed in the slot the removed middleware ` +
+					`originally occupied, but the reference should be updated. ` +
 					`For details, see the migration guide at ` +
 					`https://ui5.github.io/cli/next/updates/migrate-v5`);
 			}
 
-			refMiddlewareIdx = this.middlewareExecutionOrder.indexOf(refMiddlewareName);
-
 			if (refMiddlewareIdx === -1) {
-				// Provide clear error message, including remapping context if applicable
-				const errorMsg = legacyMapping ?
-					`Could not find fallback middleware "${refMiddlewareName}" ` +
-					`(mapped from removed middleware "${originalRefMiddlewareName}"), ` +
-					`referenced by custom middleware "${middlewareName}"` :
-					`Could not find middleware ${refMiddlewareName}, referenced by custom ` +
-					`middleware ${middlewareName}`;
-				throw new Error(errorMsg);
+				throw new Error(`Could not find middleware ${refMiddlewareName}, referenced by custom ` +
+					`middleware ${middlewareName}`);
 			}
 			if (afterMiddleware) {
 				// Insert after index of referenced middleware
@@ -272,7 +258,8 @@ class MiddlewareManager {
 				});
 			}
 		});
-		await this.addMiddleware("testRunner");
+		this.#addLegacyMiddlewarePlaceholder("testRunner");
+		this.#addLegacyMiddlewarePlaceholder("serveThemes");
 		await this.addMiddleware("versionInfo", {
 			mountPath: "/resources/sap-ui-version.json"
 		});
@@ -327,11 +314,11 @@ class MiddlewareManager {
 			}
 
 			let middlewareName = middlewareDef.name;
-			if (this.middleware[middlewareName]) {
+			if (this.#isMiddlewareNameKnown(middlewareName)) {
 				// Middleware is already known
 				// => add a suffix to allow for multiple configurations of the same middleware
 				let suffixCounter = 0;
-				while (this.middleware[middlewareName]) {
+				while (this.#isMiddlewareNameKnown(middlewareName)) {
 					suffixCounter++; // Start at 1
 					middlewareName = `${middlewareDef.name}--${suffixCounter}`;
 				}
@@ -363,6 +350,35 @@ class MiddlewareManager {
 			});
 		}
 	}
+
+	/**
+	 * Inserts a no-op placeholder for a removed standard middleware into the execution order.
+	 * Placeholders preserve the original slot so custom middlewares referencing the removed
+	 * middleware via beforeMiddleware / afterMiddleware keep their intended position.
+	 * They are stripped in applyMiddleware() before mounting on the express app.
+	 *
+	 * @private
+	 * @param {string} middlewareName Name of the removed standard middleware
+	 */
+	#addLegacyMiddlewarePlaceholder(middlewareName) {
+		this.legacyMiddlewarePlaceholders.add(middlewareName);
+		this.middlewareExecutionOrder.push(middlewareName);
+	}
+
+	/**
+	 * Returns whether the given middleware name is already known — either registered
+	 * in <code>this.middleware</code> or occupying a legacy placeholder slot.
+	 * Placeholder names are treated as known to avoid collisions in the execution order:
+	 * a custom middleware named e.g. "testRunner" would otherwise clash with the
+	 * placeholder inserted to preserve its original slot.
+	 *
+	 * @private
+	 * @param {string} middlewareName Middleware name to check
+	 * @returns {boolean}
+	 */
+	#isMiddlewareNameKnown(middlewareName) {
+		return !!(this.middleware[middlewareName] || this.legacyMiddlewarePlaceholders.has(middlewareName));
+	}
 }
 
 export default MiddlewareManager;
diff --git a/packages/server/lib/middleware/middlewareRepository.js b/packages/server/lib/middleware/middlewareRepository.js
index 613af7a738e..a4a28fac5d0 100644
--- a/packages/server/lib/middleware/middlewareRepository.js
+++ b/packages/server/lib/middleware/middlewareRepository.js
@@ -7,7 +7,6 @@ const middlewareInfos = {
 	serveIndex: {path: "./serveIndex.js"},
 	discovery: {path: "./discovery.js"},
 	versionInfo: {path: "./versionInfo.js"},
-	testRunner: {path: "./testRunner.js"},
 	nonReadRequests: {path: "./nonReadRequests.js"}
 };
 
diff --git a/packages/server/lib/middleware/testRunner.js b/packages/server/lib/middleware/testRunner.js
deleted file mode 100644
index 71bb4f4b79b..00000000000
--- a/packages/server/lib/middleware/testRunner.js
+++ /dev/null
@@ -1,62 +0,0 @@
-import {promisify} from "node:util";
-import fs from "graceful-fs";
-const readFile = promisify(fs.readFile);
-import {fileURLToPath} from "node:url";
-import mime from "mime-types";
-import parseurl from "parseurl";
-import {getLogger} from "@ui5/logger";
-const log = getLogger("server:middleware:testRunner");
-
-const testRunnerResourceRegEx = /\/test-resources\/sap\/ui\/qunit\/(testrunner\.(html|css)|TestRunner.js)$/;
-const resourceCache = Object.create(null);
-
-function serveResource(res, resourcePath, resourceContent) {
-	const type = mime.lookup(resourcePath) || "application/octet-stream";
-	const charset = mime.charset(type);
-	const contentType = type + (charset ? "; charset=" + charset : "");
-
-	// resources served by this middleware do not change often
-	res.setHeader("Cache-Control", "public, max-age=1800");
-
-	res.setHeader("Content-Type", contentType);
-	res.end(resourceContent);
-}
-
-/**
- * Creates and returns the middleware to serve a resource index.
- *
- * @module @ui5/server/middleware/testRunner
- * @param {object} parameters Parameters
- * @param {object} parameters.resources Contains the resource reader or collection to access project related files
- * @returns {Function} Returns a server middleware closure.
- */
-function createMiddleware({resources}) {
-	return async function(req, res, next) {
-		try {
-			const pathname = parseurl(req).pathname;
-			const parts = testRunnerResourceRegEx.exec(pathname);
-			const resourceName = parts && parts[1];
-
-			if (resourceName) { // either "testrunner.html", "testrunner.css" or "TestRunner.js" (case sensitive!)
-				log.verbose(`Serving ${pathname}`);
-				let pResource;
-				if (!resourceCache[pathname]) {
-					const filePath = fileURLToPath(new URL(`./testRunner/${resourceName}`, import.meta.url));
-					pResource = readFile(filePath, {encoding: "utf8"});
-					resourceCache[pathname] = pResource;
-				} else {
-					pResource = resourceCache[pathname];
-				}
-
-				const resourceContent = await pResource;
-				serveResource(res, pathname, resourceContent);
-			} else {
-				next();
-			}
-		} catch (err) {
-			next(err);
-		}
-	};
-}
-
-export default createMiddleware;
diff --git a/packages/server/lib/middleware/testRunner/TestRunner.js b/packages/server/lib/middleware/testRunner/TestRunner.js
deleted file mode 100644
index d7efe7ed8f9..00000000000
--- a/packages/server/lib/middleware/testRunner/TestRunner.js
+++ /dev/null
@@ -1,674 +0,0 @@
-(function(window) {
-	"use strict";
-
-	/*global CollectGarbage, Handlebars */
-	/* eslint radix: 0 */
-
-	/*
-	 * Simulate the JSUnit Testsuite to collect the available
-	 * test pages per Suite
-	 */
-	window.jsUnitTestSuite = function() {};
-	window.jsUnitTestSuite.prototype.getTestPages = function() {
-		return this.aPages;
-	};
-	window.jsUnitTestSuite.prototype.addTestPage = function(sTestPage) {
-		this.aPages = this.aPages || [];
-		// in case of running in the root context the testsuites right now
-		// generate an invalid URL because they assume that test-resources is
-		// the context path - this section makes sure to remove the duplicate
-		// test-resources segments in the path
-		if (sTestPage.indexOf("/test-resources/test-resources") === 0 || sTestPage.indexOf("/test-resources/resources") === 0) {
-			sTestPage = sTestPage.substr("/test-resources".length);
-		}
-		this.aPages.push(sTestPage);
-	};
-
-	function XHRQueue(iMaxParallelRequests, iWaitTime) {
-		this.iLimit = iMaxParallelRequests === undefined ? Infinity : iMaxParallelRequests;
-		this.iWaitTime = iWaitTime === undefined ? 0 : iWaitTime;
-		this.aPendingTasks = [];
-		this.oRunningTasks = new Set();
-		this.iLastTaskExecution = -Infinity;
-	}
-
-	XHRQueue.prototype.ajax = function(sUrl, options) {
-		var oTask = {
-			url: sUrl,
-			options: options
-		};
-		oTask.promise = new Promise(function(resolve, reject) {
-			oTask.resolve = resolve;
-			oTask.reject = reject;
-		});
-		this.aPendingTasks.push(oTask);
-		this._processNext();
-		return oTask.promise;
-	};
-
-	XHRQueue.prototype._processNext = function() {
-		var iNow = Date.now();
-		var iDelay = iNow - this.iLastTaskExecution;
-		if ( iDelay < this.iWaitTime ) {
-			setTimeout(function() {
-				this._processNext();
-			}.bind(this), iDelay);
-			return;
-		}
-		if ( this.aPendingTasks.length > 0 && this.oRunningTasks.size < this.iLimit ) {
-			var oTask = this.aPendingTasks.shift();
-			this.oRunningTasks.add(oTask);
-			this.iLastTaskExecution = iNow;
-			Promise.resolve(jQuery.ajax(oTask.url, oTask.options))
-				.then(oTask.resolve, oTask.reject)
-				.finally(function() {
-					this.oRunningTasks.delete(oTask);
-					this._processNext();
-				}.bind(this));
-		}
-	};
-
-	var oXHRQueue = new XHRQueue(50, 2);
-
-	/*
-	 * Template for test results
-	 */
-	var sResultsTemplate = "{{#tests}}" +
-							"<div class=\"testResult {{outcome}}\">" +
-								"<p>{{header}}</p>" +
-									"<ol style=\"display: none\">" +
-									"{{#results}}" +
-										"<li class=\"{{result.sLiClass}} test\">" +
-											"<p style=\"display: inline\">{{result.TestName}} ({{result.Failed}} ,{{result.Passed}} ,{{result.All}}) </p>" +
-											"<a href=\"{{result.rerunlink}}\"> Rerun</a>" +
-											"<ol>" +
-											"{{#result.testmessages}}" +
-												"<li class=\"{{classname}} check\">{{message}}" +
-												"<br>{{expected}}" +
-												"<br>{{actual}}" +
-												"<br>{{diff}}" +
-												"<br>{{source}}" +
-												"</li>" +
-											"{{/result.testmessages}}" +
-											"</ol>" +
-										"</li>" +
-									"{{/results}}" +
-									"</ol>" +
-							"</div>" +
-						"{{/tests}}";
-
-	/**
-	 * Utility class to find test pages and check them for being
-	 * a testsuite or a QUnit testpage - also it returns the coverage
-	 * results.
-	 */
-	window.sap = window.sap || {};
-	window.sap.ui = window.sap.ui || {};
-	window.sap.ui.qunit = window.sap.ui.qunit || {};
-	window.sap.ui.qunit.TestRunner = {
-
-		checkTestPage: function(sTestPage, bSequential) {
-			var oPromise =
-				this._checkTestPage(sTestPage, bSequential)
-				.then(function(aTestPages) {
-					return aTestPages;
-				});
-			oPromise.done = oPromise.then; // compat for Deferred
-			oPromise.fail = oPromise.catch; // compat for Deferred
-			return oPromise;
-		},
-
-		_checkTestPage: function(sTestPage, bSequential) {
-
-			var oPromise = new Promise(function(resolve, reject) {
-
-				if (typeof sTestPage !== "string") {
-					window.console.log("QUnit: invalid test page specified");
-					reject("QUnit: invalid test page specified");
-				}
-
-				/*
-				if (window.console && typeof window.console.log === "function") {
-					window.console.log("QUnit: checking test page: " + sTestPage);
-				}*/
-
-				// check for an existing test page and check for test suite or page
-				oXHRQueue.ajax(sTestPage).then(function(sData) {
-					if (/(?:window\.suite\s*=|function\s*suite\s*\(\s*\)\s*{)/.test(sData)
-							|| (/data-sap-ui-testsuite/.test(sData) && !/sap\/ui\/test\/starter\/runTest/.test(sData))
-							|| /sap\/ui\/test\/starter\/createSuite/.test(sData) ) {
-						var $frame = jQuery("<iframe>");
-						var that = this;
-
-						var onSuiteReady = function(oIFrame) {
-							that.findTestPages(oIFrame, bSequential).then(function(aTestPages) {
-								var aTestPagesFiltered = aTestPages.filter(function(e, i, a) { return a.indexOf(e) === i; });
-								$frame.remove();
-								// avoid duplicates in test pages
-								resolve(aTestPagesFiltered);
-							}, function(oError) {
-								if (window.console && typeof window.console.error === "function") {
-									window.console.error("QUnit: failed to load page '" + sTestPage + "'" + " Error: " + oError);
-								}
-								$frame.remove();
-								resolve([]);
-							});
-						};
-
-						$frame.css("display", "none");
-						$frame.one("load", function() {
-							if (typeof this.contentWindow.suite === "function") {
-								onSuiteReady(this);
-							} else {
-								// Wait for a CustomEvent in case window.suite isn't defined, yet
-								this.contentWindow.addEventListener("sap-ui-testsuite-ready", function() {
-									onSuiteReady(this);
-								}.bind(this));
-							}
-						});
-						$frame.attr("src", sTestPage);
-						$frame.appendTo(document.body);
-					} else {
-						resolve([sTestPage]);
-					}
-				}.bind(this)).catch(function(xhr,status,msg) {
-					var text = (xhr ? xhr.status + " " : "") + (msg || status || 'unspecified error');
-					if (window.console && typeof window.console.error === "function") {
-						window.console.error("QUnit: failed to load page '" + sTestPage + "': " + text);
-					}
-					var oContext = this.createFailContext(sTestPage, "Testsite could not be loaded");
-					this.printTestResult(oContext);
-					resolve([]);
-				}.bind(this));
-
-			}.bind(this));
-
-			return oPromise;
-
-		},
-
-		findTestPages: function(oIFrame, bSequential) {
-
-			return Promise.resolve(oIFrame.contentWindow.suite()).then(function(oSuite) {
-				var aPages = oSuite && oSuite.getTestPages() || [];
-				return new Promise(function(resolve, reject) {
-
-					try {
-
-						if (aPages.length > 0) {
-
-							var aTestPagePromises = [];
-
-							if (bSequential) {
-
-								var aTestPages = [];
-								aTestPagePromises.push(aPages.reduce(function(oPromise, sTestPage) {
-									return oPromise.then(this._checkTestPage.bind(this, sTestPage, bSequential)).then(function(aFoundTestPages) {
-										aTestPages = aTestPages.concat(aFoundTestPages);
-									});
-								}.bind(this), Promise.resolve([])).then(function() {
-									return aTestPages;
-								}));
-
-							} else {
-
-								for (var i = 0, l = aPages.length; i < l; i++) {
-									var sTestPage = aPages[i];
-									aTestPagePromises.push(this._checkTestPage(sTestPage, bSequential));
-								}
-
-							}
-
-							if (aTestPagePromises.length > 0) {
-								Promise.all(aTestPagePromises).then(function(aFoundTestPages) {
-									var aTestPages = [];
-									for (var i = 0, l = aFoundTestPages.length; i < l; i++) {
-										aTestPages = aTestPages.concat(aFoundTestPages[i]);
-									}
-									resolve(aTestPages);
-								})
-								.catch(function(oError){
-									if (window.console && typeof window.console.error === "function") {
-										window.console.error("[DEBUG] findTestPages Promise.all error: " + oError);
-									}
-								});
-							}
-
-					} else {
-						resolve([]);
-					}
-
-					} catch (ex) {
-						if (window.console && typeof window.console.error === "function") {
-							window.console.error("QUnit: error while analyzing test page '" + oIFrame.src + "':\n" + ex);
-							if ( ex.stack ) {
-								window.console.error(ex.stack);
-							}
-						}
-						resolve([]);
-					}
-
-				}.bind(this));
-			}.bind(this));
-
-		},
-
-		runTests: function(aTestPages, nBarStep, bInternal) {
-
-			if (!bInternal) {
-				this._bStopped = false;
-			}
-
-			// TODO: stop testing
-
-			var sTestPage = aTestPages[0];
-
-			aTestPages = aTestPages.slice(1);
-
-			return new Promise(function(resolve, reject) {
-
-				if (sTestPage) {
-					this.runTest(sTestPage, true, this).then(function(oResult) {
-						var nBarwidth = parseFloat(jQuery("div#innerBar")[0].style.width, 10);
-						var sNewwidth = nBarwidth + nBarStep + "%";
-						jQuery("div#innerBar").text(Math.round(nBarwidth + nBarStep) + "%");
-						jQuery("div#innerBar").width(sNewwidth);
-						if (parseInt(jQuery("div#reportingHeader span.failed").text()) > 0) {
-							jQuery("div#innerBar")[0].style.backgroundColor = '#ed866f';
-						}
-						jQuery("div#time").text(Math.round((new Date() - window.oStartTime) / 1000) + " Seconds");
-						jQuery("#selectedTests").find("option").each(function() {
-							if (jQuery(this).text() === sTestPage) {
-								jQuery(this).remove();
-							}
-						});
-						return this.runTests(aTestPages, nBarStep, true);
-					}.bind(this)).then(function() {
-						resolve();
-					});
-				} else {
-					resolve();
-				}
-
-			}.bind(this));
-
-		},
-
-		printTestResultAndRemoveFrame : function (oInst, $frame, $framediv, oContext) {
-			var oBlanketCoverage = $frame[0].contentWindow._$blanket;
-
-			// in case of coverage either merge it or set it on the _$blanket object
-			if (oBlanketCoverage) {
-				window._$blanket = window._$blanket || {};
-				jQuery.each(oBlanketCoverage, function(sModule, aCoverageInfo) {
-					if (!window._$blanket[sModule]) {
-						window._$blanket[sModule] = aCoverageInfo;
-					} else {
-						jQuery.each(aCoverageInfo, function(iIndex, iCount) {
-							window._$blanket[sModule][iIndex] += iCount;
-						});
-					}
-				});
-			}
-
-			$frame[0].src = "about:blank";
-			$frame[0].contentWindow.document.write('');
-			$frame[0].contentWindow.close();
-
-			if ( typeof CollectGarbage == "function") {
-				CollectGarbage(); // eslint-disable-line
-			}
-
-			$framediv.remove();
-
-			this.printTestResult(oContext);
-		},
-
-		printTestResult: function (oContext) {
-			var fnTemplate = Handlebars.compile(sResultsTemplate);
-			var sHTML = fnTemplate(oContext);
-			var $testResult = jQuery(sHTML);
-			var $children = $testResult.children();
-			jQuery($children[0]).on("click", function() {
-				jQuery(this.nextSibling).toggle();
-			});
-			jQuery($children[1]).find("li.test > p").on("click", function() {
-				jQuery(this.parentElement.children[2]).toggle();
-			});
-			$testResult.appendTo("div.test-reporting");
-		},
-
-		runTest: function(sTestPage, bInternal, oInst) {
-
-			if (!bInternal) {
-				this._bStopped = false;
-			}
-
-			return new Promise(function(resolve, reject) {
-
-				if (this._bStopped) {
-
-					reject();
-
-				} else {
-
-					// we could make this configurable
-					var $frame = jQuery("<iframe>").css({
-						height: "1024px",
-						width: "1280px"
-					});
-
-					$frame.attr("src", sTestPage);
-					var $framediv = jQuery("<div>").css({
-						height: "400px",
-						width: "100%",
-						overflow: "scroll"
-					});
-					$frame.appendTo($framediv);
-					$framediv.appendTo("div.test-execution");
-
-					var iTestTimeout = parseInt(this.getUrlParameter("test-timeout")) || 300000;
-					var tBegin = new Date();
-					var oContext;
-					var fnCheckSuccess = function() {
-						var doc = $frame[0].contentWindow.document;
-						var $doc = jQuery(doc);
-						var sTestName = $doc.find("h1#qunit-header").text();
-						var $results = $doc.find("ol#qunit-tests > li");
-						var $qunitBanner = $doc.find("#qunit-banner");
-
-						if ($qunitBanner.hasClass("qunit-fail") || $qunitBanner.hasClass("qunit-pass")) {
-
-							if (sTestName == " ") {
-								sTestName = "QUnit page for " + doc.baseURI.substring(doc.baseURI.indexOf("test-resources") + 15, doc.baseURI.length);
-							}
-							oContext = oInst.fnGetTestResults(sTestName, $results);
-							this.printTestResultAndRemoveFrame(oInst, $frame, $framediv, oContext);
-
-							resolve();
-							return;
-						}
-
-						if (new Date() - tBegin < iTestTimeout) {
-							setTimeout(fnCheckSuccess, 100);
-						} else {
-							var QUnit = $frame[0].contentWindow.QUnit;
-							if (QUnit) {
-								// push a failure and add the results that where run to the report
-								oContext = oInst.fnGetTestResults(sTestName, $results);
-								oContext.tests[0].header = "Testsuite was not completed after " + Math.round(iTestTimeout / 1000) + " seconds : " + sTestName;
-								oContext.tests[0].outcome = "fail";
-								oContext.tests[0].results.push(
-									{
-										result : {
-											TestName: "Timeout occured",
-											outcome: "fail",
-											Failed: "1",
-											Passed: "0",
-											All: "1",
-											rerunlink : $frame[0].contentWindow.location.href,
-											sLiClass: "fail",
-											testmessages: "no assertions"
-										}
-									}
-								);
-							} else {
-								// No qunit print error message
-								oContext = this.createFailContext($frame[0].contentWindow.location.href, "Testsite did not load QUnit after 5 minutes");
-							}
-							this.printTestResultAndRemoveFrame(oInst, $frame, $framediv, oContext);
-							// TODO: set Test overview visible
-							resolve();
-						}
-					}.bind(this);
-
-					fnCheckSuccess();
-
-				}
-
-			}.bind(this));
-
-		},
-
-		createFailContext : function (sHref, sHeaderMessage) {
-			this.updateResultHeader("1", "0", "1");
-			return {
-				tests: [{
-					header: sHeaderMessage + " : " + sHref,
-					outcome: "fail",
-					results:[
-						{
-							result: {
-								TestName: "No test where run",
-								Failed: "1",
-								Passed: "0",
-								All: "1",
-								rerunlink : sHref,
-								sLiClass: "fail",
-								testmessages: "no assertions"
-							}
-						}
-					]
-				}]
-			};
-		},
-
-		stopTests: function() {
-			this._bStopped = true;
-		},
-
-		hasCoverage: function() {
-			return !!this.getCoverage();
-		},
-
-		getCoverage: function() {
-			return window._$blanket || window.top.__coverage__;
-		},
-
-		reportCoverage: function (reportToEl) {
-			var oCoverage = this.getCoverage();
-
-			if (!oCoverage) {
-				return;
-			}
-
-			if ( window.blanket && !window.top.__coverage__ ) {
-				window.blanket.report({});
-			} else {
-				jQuery.ajax("/.ui5/coverage/report", {
-					method: "POST",
-					data: JSON.stringify(window.top.__coverage__),
-					headers: {
-						"Content-Type": "application/json"
-					}
-				})
-				.then(function (oData) {
-					var aReports = oData.availableReports;
-					var oHTMLReport = aReports.filter(function (oCurReport) {
-						// HTML is the only one that make sense and
-						// provides understandable information
-						return oCurReport.report === "html";
-					})[0];
-
-					if (!oHTMLReport) { // Do not render reports if HTML or lcov are not provided
-						return;
-					}
-
-					var oFrameEl = document.createElement("iframe");
-					oFrameEl.src = "/.ui5/coverage/report/" + oHTMLReport.destination;
-					oFrameEl.style.border = "none";
-					oFrameEl.style.width = "100%";
-					oFrameEl.style.height = "100vh";
-					oFrameEl.sandbox = "allow-scripts";
-					reportToEl.appendChild(oFrameEl);
-				});
-			}
-		},
-
-		getTestPageUrl: function(sFallbackUrl) {
-			var sTestPageUrl = this.getUrlParameter("testpage");
-			if (sTestPageUrl) {
-				var sOrigin = window.location.origin ? window.location.origin : (window.location.protocol + "//" + window.location.host);
-				// Check whether first character is "/"
-				if (sTestPageUrl.match(/^\/(?!\/)/)) {
-					return sOrigin + sTestPageUrl;
-				}
-				// sTestPageUrl might be a full href
-				// => check whether protocol and host matches current location
-				var aTestPageUrlMatch = sTestPageUrl.match(/^(https?:\/\/[^\/]+)(\/.*)$/i);
-				if (aTestPageUrlMatch && aTestPageUrlMatch[1] === sOrigin) {
-					// Still use the known current location and append given path segment just to make sure
-					return sOrigin + aTestPageUrlMatch[2];
-				}
-
-				throw new Error("Invalid value for URL parameter 'testpage': Path segment must start with '/'. " +
-					"If given, protocol and host must match the current location.");
-			}
-
-			// Fallback to generic testsuite page
-			if ( sFallbackUrl == null ) {
-				var sContextPath;
-				// Match the path segment before the first "test-resources" segment
-				var aContextPathMatch = window.location.pathname.match(/(.*?)\/(?:test-resources)/);
-				if (aContextPathMatch && aContextPathMatch[1]) {
-					sContextPath = aContextPathMatch[1];
-				} else {
-					sContextPath = "";
-				}
-				sFallbackUrl = sContextPath + "/test-resources/qunit/testsuite.qunit.html";
-			}
-
-			return sFallbackUrl;
-		},
-
-		getAutoStart: function() {
-			var sAutoStart = this.getUrlParameter("autostart");
-			return sAutoStart == "true";
-		},
-
-		getUrlParameter: function(sName) {
-			var sTestPageUrlParam = window.location.search.substring(1),
-				aUrlParameters = sTestPageUrlParam.split("&"),
-				aParameter;
-			for (var i = 0; i < aUrlParameters.length; i++) {
-				aParameter = aUrlParameters[i].split("=");
-				if (aParameter[0] == sName) {
-					return decodeURIComponent(aParameter[1]);
-				}
-			}
-		},
-
-		updateResultHeader : function (sNumAll, sNumPassed, sNumFailed) {
-			var nTotalTests = parseInt(jQuery("div#reportingHeader span.total").text());
-			nTotalTests = nTotalTests + parseInt(sNumAll);
-			jQuery("div#reportingHeader span.total").text(nTotalTests);
-
-			var nPassedTests = parseInt(jQuery("div#reportingHeader span.passed").text());
-			nPassedTests = nPassedTests + parseInt(sNumPassed);
-			jQuery("div#reportingHeader span.passed").text(nPassedTests);
-
-			var nFailedTests = parseInt(jQuery("div#reportingHeader span.failed").text());
-			nFailedTests = nFailedTests + parseInt(sNumFailed);
-			jQuery("div#reportingHeader span.failed").text(nFailedTests);
-		},
-
-		fnGetTestResults: function(sHeader, aTestResults) {
-
-			// build the context
-			var oContext = {
-				tests: [{
-					header: sHeader,
-					outcome: "pass",
-					results:[]
-				}]
-			};
-
-			for (var i = 0; i < aTestResults.length; i++) {
-
-				var $checkItems = jQuery(aTestResults[i]).find("ol > li");
-				var aTestMessages = [];
-
-				for (var y = 0; y < $checkItems.length; y++) {
-
-					var oTestMessage = {message: "", expected: "", actual: "", diff: "", source: "", classname: $checkItems[y].className};
-
-					if ($checkItems[y].className === "pass") {
-					oTestMessage.message = jQuery($checkItems[y]).text();
-					} else {
-						var $messageSpan = jQuery($checkItems[y]).find("span.test-message");
-						oTestMessage.message = jQuery($messageSpan[0]).text();
-
-						var $testExpected = jQuery($checkItems[y]).find("tr.test-expected");
-						if ($testExpected.length > 0) {
-							oTestMessage.expected = jQuery($testExpected[0]).text();
-						}
-
-						var $testActual = jQuery($checkItems[y]).find("tr.test-actual");
-						if ($testActual.length > 0) {
-							oTestMessage.actual = jQuery($testActual[0]).text();
-						}
-
-						var $testDiff = jQuery($checkItems[y]).find("tr.test-diff");
-						if ($testDiff.length > 0) {
-							oTestMessage.diff = jQuery($testDiff[0]).text();
-						}
-
-						var $testSource = jQuery($checkItems[y]).find("tr.test-source");
-						if ($testSource.length > 0) {
-							oTestMessage.source = jQuery($testSource[0]).text();
-						}
-					}
-
-					aTestMessages.push(oTestMessage);
-				}
-
-				var $test = jQuery(aTestResults[i]);
-				var sTestSummary = $test.children("strong").text();
-
-				var m = sTestSummary.match(/^([\S\s]*)\((\d+)(?:,\s*(\d+),\s*(\d+))?\)\s*$/);
-				var sTestName;
-				var sNumFailed;
-				var sNumPassed;
-				var sNumAll;
-				// test still running
-				if (!m) {
-					sTestName = sTestSummary + " - Timed out and did not run completely";
-					sNumFailed = "1";
-				} else {
-					sTestName = m[1];
-					if ( m[3] || m[4] ) {
-						sNumFailed = m[2];
-						sNumPassed = m[3];
-						sNumAll = m[4];
-					} else {
-						sNumPassed = sNumAll = m[2];
-						sNumFailed = "0";
-					}
-				}
-
-				var sRerunLink = $test.find("A").attr("href");
-
-				var sLineItemClass = sNumFailed === "0" ? "pass" : "fail";
-				if (sLineItemClass === "fail") {
-					oContext.tests[0].outcome = sLineItemClass;
-				}
-
-				oContext.tests[0].results.push({result:{
-					TestName: sTestName,
-					Failed: sNumFailed,
-					Passed: sNumPassed,
-					All: sNumAll,
-					rerunlink: sRerunLink,
-					sLiClass: sLineItemClass,
-					testmessages: aTestMessages }
-				});
-				this.updateResultHeader(sNumAll, sNumPassed, sNumFailed);
-			}
-
-			return oContext;
-
-		}
-
-	};
-
-}(window));
diff --git a/packages/server/lib/middleware/testRunner/testrunner.css b/packages/server/lib/middleware/testRunner/testrunner.css
deleted file mode 100644
index bbb08631e89..00000000000
--- a/packages/server/lib/middleware/testRunner/testrunner.css
+++ /dev/null
@@ -1,81 +0,0 @@
-.testResult.pass > p{
-	padding: 0.5em 0 0.5em 1em;
-	color: #000000;
-	background-color: #a4ec81;
-	font-size: 1em;
-	line-height: 1em;
-	font-weight: bold;
-	cursor: pointer;
-	font-family: "Arial";
-	margin-bottom: 5px;
-	margin-left: 5px;
-	margin-right: 5px;
-}
-
-.testResult {
-	margin-bottom: 0px;
-}
-
-.testResult.pass {
-	display: none;
-}
-
-.testResult.fail > p{
-	background-color: #ed866f;
-	color: #000000;
-	padding: 0.5em 0 0.5em 1em;
-	font-size: 1em;
-	line-height: 1em;
-	font-weight: bold;
-	cursor: pointer;
-	font-family: "Arial";
-	margin-bottom: 5px;
-	margin-left: 5px;
-	margin-right: 5px;
-}
-
-h3, li, p, h1, div {
-	font-family: "Arial";
-}
-
-.testResult .fail{
-	background-color: #ed866f;
-}
-
-.testResult .pass{
-	background-color: #a4ec81;
-}
-
-.testResult li{
-	border-bottom: 1px solid #fff;
-	padding: 0.4em 0.5em 0.4em 1.5em;
-	color: #000000;
-	font-size: small;
-}
-
-.testResult ol{
-	list-style-position: inside;
-	margin-top: -5px;
-	margin-left: 5px;
-	margin-right: 5px;
-	padding: inherit;
-}
-
-li.pass > br:empty {
-	display: none;
-}
-
-li.pass.test > ol {
-	display: none;
-}
-
-li.test > p {
-	cursor: pointer;
-}
-li.check {
-	border: 0px;
-}
-
-.bl-source {
-	font-size: 12px;
-}
\ No newline at end of file
diff --git a/packages/server/lib/middleware/testRunner/testrunner.html b/packages/server/lib/middleware/testRunner/testrunner.html
deleted file mode 100644
index c03f906cfc2..00000000000
--- a/packages/server/lib/middleware/testRunner/testrunner.html
+++ /dev/null
@@ -1,310 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<head>
-	<meta charset="utf-8">
-	<title>SAPUI5 QUnit TestRunner</title>
-
-	<script src="../../../../resources/sap/ui/thirdparty/es6-promise.js"></script>
-	<script nomodule src="../../../../resources/sap/ui/thirdparty/es6-shim-nopromise.js"></script>
-	<script src="../../../../resources/sap/ui/thirdparty/jquery.js"></script>
-
-	<script src="../../../../resources/sap/ui/thirdparty/handlebars.js"></script>
-	<script src="../../../../resources/sap/ui/thirdparty/blanket.js"></script>
-
-	<script src="TestRunner.js"></script>
-	<link rel="stylesheet" href="testrunner.css">
-
-	<script id="qunitResults" type="text/x-handlebars-template">
-		<select id="testPageSelect" name="testPages" size="10" multiple style="width: 100%" >
-			{{#pages}}
-				<option value={{page}}>{{page}}</option>
-			{{/pages}}
-		</select>
-	</script>
-
-	<script>
-	jQuery.fn.filterByText = function($textbox) {
-		return this.each(function() {
-			var selectbox = this;
-			var options = [];
-			jQuery(selectbox).find("option").each(function() {
-				options.push({value: jQuery(this).val(), text: jQuery(this).text()});
-			});
-			jQuery(selectbox).data("options", options);
-
-			// jQuery object or a selector
-			// (https://codeql.github.com/codeql-query-help/javascript/js-unsafe-jquery-plugin/)
-			$textbox = ($textbox instanceof jQuery) ? $textbox : jQuery(jQuery.find($textbox));
-			$textbox.on("change keyup", function() {
-				var options = jQuery(selectbox).empty().data("options");
-				var search = jQuery(this).val().trim();
-				var regex = new RegExp(search, "gi");
-
-				jQuery.each(options, function(i) {
-					var option = options[i];
-					if(option.text.match(regex) !== null) {
-						jQuery(selectbox).append(jQuery("<option>").text(option.text).val(option.value).on("dblclick", function() {
-							jQuery("#selectedTests").append(jQuery(this).clone());
-						}));
-					}
-				});
-			});
-		});
-	};
-
-	function prepareNewRun() {
-		jQuery("div#innerBar").width("0%");
-		jQuery("#stop").toggle();
-		jQuery("div.testResult").remove();
-		jQuery("span.total").text("0");
-		jQuery("span.passed").text("0");
-		jQuery("span.failed").text("0");
-		jQuery("#coverageFrame").remove();
-		jQuery("div.test-coverage").hide();
-	}
-
-	jQuery(function() {
-
-		jQuery("#testPageLabel").text(window.location.origin);
-
-		function showResults() {
-			jQuery("div.test-reporting").attr("style", "padding: 0px; display: block; border: 1px solid rgb(170, 170, 170); margin: 10px;");
-			jQuery("#openReporting").attr("style", "width:0px;height:0px;margin:5px;border-style:solid;border-width:0 12px 12px 12px;border-color:transparent transparent #007dc0 transparent;float: right;position: relative;left: -10px;cursor: pointer;");
-			var $this = jQuery("#showResults");
-			if($this.val() === "Show all results") {
-				jQuery("div.testResult").show();
-				$this.val("Show errors only");
-			} else {
-				jQuery("div.testResult.pass").hide();
-				jQuery("div.testResult.fail").show();
-				$this.val("Show all results");
-			}
-		}
-		jQuery("#showResults").on("click", showResults);
-
-		jQuery("#testPage").val(sap.ui.qunit.TestRunner.getTestPageUrl());
-
-		function find() {
-			prepareNewRun();
-			var oContext = { pages:[] };
-			return sap.ui.qunit.TestRunner.checkTestPage(jQuery("#testPage").val(), document.getElementById("sequential").checked).then(function(aTestPages) {
-				window.aTestPages = aTestPages;
-				for (var i = 0; i < aTestPages.length; i++) {
-					oContext.pages.push({page: aTestPages[i]});
-				}
-				var fnTemplate = Handlebars.compile(jQuery("#qunitResults").html());
-				var sHTML = fnTemplate(oContext);
-				jQuery("#testPageSelectDiv").html(sHTML);
-				jQuery("#testPageSelect > option").on("dblclick", function () {
-					jQuery("#selectedTests").append(jQuery("#find").clone());
-				});
-				jQuery("#copyButtons").show();
-				jQuery("#selectedTestsDiv").show();
-
-				jQuery("#testPageSelect").filterByText(jQuery("#filter"));
-				jQuery("#filter").show();
-				jQuery("#console").val(aTestPages.join("\n"));
-			});
-		}
-		jQuery("#find").on("click", find);
-
-		function copy() {
-			var aSelectedTests = jQuery("#testPageSelect")[0].selectedOptions;
-			for (var i = 0; i < aSelectedTests.length; i++) {
-				jQuery("#selectedTests").append(jQuery("<option>").text(jQuery(aSelectedTests[i]).text()).val(jQuery(aSelectedTests[i]).text()));
-			}
-		}jQuery("#copy").on("click", copy);
-
-		function copyAll() {
-			jQuery("#selectedTests").append(jQuery("#testPageSelect > option").clone());
-		}
-		jQuery("#copyall").on("click", copyAll);
-
-		function remove() {
-			var aSelectedTests = jQuery("#selectedTests")[0].selectedOptions;
-			for (var i = aSelectedTests.length-1; i >= 0; i--) {
-				jQuery(aSelectedTests[i]).remove();
-			}
-		}jQuery("#remove").on("click", remove);
-
-		function removeAll() {
-			jQuery("#selectedTests > option").remove();
-		}
-		jQuery("#removeall").on("click", removeAll);
-
-		function run() {
-			jQuery("#open").trigger("click");
-			window.oStartTime = new Date();
-			var $this = jQuery("#run");
-			if ($this.val() === "Run") {
-				//$this.val("Stop");
-				var aTests = [];
-				var aSelectedTests = jQuery("#selectedTests")[0].children;
-				for (var i = 0; i < aSelectedTests.length; i++) {
-					aTests.push(jQuery(aSelectedTests[i]).text());
-				}
-				var nStep = 100 / aTests.length;
-				console.log(aTests.length);
-				console.log(nStep);
-				jQuery("#reportingHeader").toggle();
-				sap.ui.qunit.TestRunner.runTests(aTests, nStep).then(function(oResult) {
-					$this.val("Run");
-					jQuery("#stop").toggle();
-					if (sap.ui.qunit.TestRunner.hasCoverage()) {
-						var $testCoverage = jQuery("div.test-coverage");
-						$testCoverage.toggle();
-						sap.ui.qunit.TestRunner.reportCoverage( $testCoverage[0] );
-					}
-				}).then(function() {
-					$this.val("Run");
-				});
-
-			} else {
-				sap.ui.qunit.TestRunner.stopTests();
-			}
-		}
-
-		jQuery("#run").on("click", function () {
-			if(jQuery("#selectedTests>option").length === 0) {
-				alert("Please select at least on test to execute");
-			} else {
-				prepareNewRun();
-				run();
-			}
-		});
-
-		function open() {
-			var $testSelection = jQuery("div#test-selection");
-			if($testSelection.hasClass("opened")) {
-				$testSelection.removeClass("opened");
-				jQuery("div#elements").toggle();
-				$testSelection.animate({height: "40px"}, 500);
-				jQuery("#open").attr("style", "width:0px;height:0px;margin:5px;border-style:solid;border-width: 12px 12px 0 12px;border-color:#007dc0 transparent transparent transparent;float: right;position: relative;left: -10px;cursor: pointer;");
-			} else {
-				$testSelection.addClass("opened");
-				$testSelection.animate({height: "300px"}, 500, function() {
-					jQuery("div#elements").toggle();
-				});
-				jQuery("#open").attr("style", "width:0px;height:0px;margin:5px;border-style:solid;border-width:0 12px 12px 12px;border-color:transparent transparent #007dc0 transparent;float: right;position: relative;left: -10px;cursor: pointer;");
-			}
-		}
-		jQuery("#open").on("click", open);
-
-
-		function openCoverage() {
-			if(jQuery("#coverageContent").is(":visible")) {
-				jQuery("#coverageContent").hide();
-				jQuery("#openCoverage").attr("style", "width:0px;height:0px;margin:5px;border-style:solid;border-width: 12px 12px 0 12px;border-color:#007dc0 transparent transparent transparent;float: right;position: relative;left: -10px;cursor: pointer;");
-			} else {
-				jQuery("#coverageContent").show();
-				jQuery("#openCoverage").attr("style", "width:0px;height:0px;margin:5px;border-style:solid;border-width:0 12px 12px 12px;border-color:transparent transparent #007dc0 transparent;float: right;position: relative;left: -10px;cursor: pointer;");
-			}
-		}
-		jQuery("#openCoverage").on("click", openCoverage);
-
-		function openReporting() {
-			jQuery("#showResults").toggle();
-			if(jQuery("#showResults").css("display") === "none") {
-				jQuery("div.testResult").hide();
-				jQuery("div.test-reporting").attr("style", "padding: 0px; display: block; border: 1px solid rgb(170, 170, 170); margin: 10px; height: 40px;");
-				jQuery("#openReporting").attr("style", "width:0px;height:0px;margin:5px;border-style:solid;border-width: 12px 12px 0 12px;border-color:#007dc0 transparent transparent transparent;float: right;position: relative;left: -10px;cursor: pointer;");
-			} else {
-				jQuery("div.test-reporting").attr("style", "padding: 0px; display: block; border: 1px solid rgb(170, 170, 170); margin: 10px;");
-				jQuery("div.testResult").show();
-				jQuery("#showResults").val("Show errors only");
-				jQuery("#openReporting").attr("style", "width:0px;height:0px;margin:5px;border-style:solid;border-width:0 12px 12px 12px;border-color:transparent transparent #007dc0 transparent;float: right;position: relative;left: -10px;cursor: pointer;");
-			}
-		}
-		jQuery("#openReporting").on("click", openReporting);
-
-		function stop() {
-			sap.ui.qunit.TestRunner.stopTests();
-		}
-		jQuery("#stop").on("click", stop);
-
-		setInterval(function() {
-			if (window.aTestPages) {
-				jQuery("#run").show();
-			}
-		}, 500);
-
-		if (sap.ui.qunit.TestRunner.getAutoStart()) {
-			find().then(function() {
-				copyAll();
-				run();
-			})
-		}
-
-	});
-
-	</script>
-
-</head>
-
-<body class="sapUiBody" style="padding: 0; margin: 0;">
-
-	<div style="padding: 10px;">
-
-		<h1>SAPUI5 Selenium-based QUnit Tests</h1>
-		<div id="test-selection" class="opened" style="border: 1px solid; border-color: #aaa; height: 300px;">
-			<div id="selectionHeader" style="height: 30px;margin-top: 0px; padding-left: 2px;padding-top: 10px;background-color: #ccc;margin-bottom: 10px;">
-				<div style="float: left; width: 10%; font-family: Arial;position: absolute">Select Tests</div>
-				<div id="progress" style="float: left;width: 400px;font-family: Arial;position: relative;left: 200px">Progress</div>
-				<div id="bar" style="float: left;position: relative;left: -130px;border: 1px solid;width: 150px;height: 19px">
-					<div id="innerBar" style="background-color: #a4ec81;width:0%;height: 19px;text-align: right"></div>
-				</div>
-				<input id="stop" type="button" value="Stop" style="float: left;position: relative;left: -125px; display: none;">
-				<div id="duration" style="float: left;width: 75px;font-family: Arial;position: relative;left: 50px">Duration</div>
-				<div id="time" style="float: left;position: relative;left: 50px;width: 200px;height: 19px" >0 Seconds</div>
-				<div id="open" style="width:0px;height:0px;margin:5px;border-style:solid;border-width:0 12px 12px 12px;border-color:transparent transparent #007dc0 transparent;float: right;position: relative;left: -10px;cursor: pointer;"></div>
-			</div>
-			<div id="elements">
-				<!-- test-resources/qunit/testsuite.qunit.html -->
-				<label id="testPageLabel" for="testPage"></label>
-				<input id="testPage" type="text" size="50">
-				<input id="sequential" type="checkbox" title="Sequential?">
-				<input id="find" type="button" value="Find">
-				<input id="run" type="button" value="Run" style="display: none;">
-				<br>
-				<!--<textarea id="console" rows="20" style="width: 100%" readonly="readonly"></textarea>-->
-				<input id="filter" type="text" size="50" style="display: none;">
-				<div id="select" style="margin: 2px;">
-					<div id="testPageSelectDiv" style="position: absolute; width: 45%; vertical-align: middle; float: left;">
-					</div>
-					<div id="copyButtons" style="position: relative; width: 37px; left: 47%; vertical-align: middle; float: left; top: 29px; display: none;">
-						<input id="copy" type="button" value=">" style="margin: 2px; width: 32px;">
-						<input id="copyall" type="button" value=">>">
-						<input id="remove" type="button" value="<" style="width: 32px; margin: 2px;">
-						<input id="removeall" type="button" value="<<">
-					</div>
-					<div id="selectedTestsDiv" style="width: 45%; position: relative; left: 48%; vertical-align: middle; float: left; display: none;">
-						<select id="selectedTests" size="10" style="width: 100%;" multiple></select>
-					</div>
-				</div>
-			</div>
-		</div>
-	</div>
-
-	<div class="test-execution" style="padding: 10px;">
-	</div>
-	<div id="reportingHeader" class="test-reporting" style="display: none; padding: 0px; border: 1px solid;border-color: #aaa;margin: 10px;">
-		<div style="height: 30px;margin-top: 0px; padding-left: 2px;padding-top: 10px;background-color: #ccc;">
-			<div style="float: left; width: 15%; font-family: Arial;position: absolute;">Test Reporting</div>
-			<div style="float: left; white-space: nowrap; width: 50%; font-family: Arial;position: relative; left: 200px">Number of executed test: <span class="total">0</span> Number of passed tests: <span class="passed">0</span> Number of failed tests: <span class="failed">0</span></div>
-			<input id="showResults" type="button" value="Show all results" style="display: none; float: left; position: relative; left: 200px; bottom: 3px">
-			<div id="openReporting" style="width:0px;height:0px;margin:5px;border-style:solid;border-width: 12px 12px 0 12px;border-color:#007dc0 transparent transparent transparent;float: right;position: relative;left: -10px;cursor: pointer;"></div>
-		</div>
-	</div>
-	<div class="test-coverage" style="padding: 0px; display: none;border: 1px solid;border-color: #aaa;margin: 10px;">
-		<div id="coverageHeader" style="height: 30px;margin-top: 0px; padding-left: 2px;padding-top: 10px;background-color: #ccc;">
-			<div style="float: left; width: 10%; font-family: Arial;position: absolute">Test Coverage</div>
-			<div id="openCoverage" style="width:0px;height:0px;margin:5px;border-style:solid;border-width: 12px 12px 0 12px;border-color:#007dc0 transparent transparent transparent;float: right;position: relative;left: -10px;cursor: pointer;"></div>
-		</div>
-		<div id="coverageContent" style="display: none;">
-			<div id="blanket-main"></div>
-		</div>
-	</div>
-
-</body>
-
-</html>
diff --git a/packages/server/nyc.config.js b/packages/server/nyc.config.js
index 541c807802e..97a32eaa322 100644
--- a/packages/server/nyc.config.js
+++ b/packages/server/nyc.config.js
@@ -1,8 +1,5 @@
 import nycCommonConfig from "../../nyc.common.config.js";
 
-// Exclude TestRunner files from coverage as they are originally maintained at https://github.com/UI5/openui5/tree/master/src/sap.ui.core/test/sap/ui/qunit
-nycCommonConfig.exclude.push("lib/middleware/testRunner/TestRunner.js");
-
 // Tested via vm.runInContext (test/lib/server/liveReloadClient.integration.js), so nyc does not track coverage.
 nycCommonConfig.exclude.push("lib/liveReload/client.js");
 
diff --git a/packages/server/package.json b/packages/server/package.json
index 09aea74c910..4e93c6725dd 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -49,7 +49,6 @@
 			"text-summary"
 		],
 		"exclude": [
-			"lib/middleware/testRunner/TestRunner.js",
 			"docs/**",
 			"coverage/**",
 			"test/**"
diff --git a/packages/server/scripts/update-testRunner-resources.sh b/packages/server/scripts/update-testRunner-resources.sh
deleted file mode 100755
index 7825e2e8183..00000000000
--- a/packages/server/scripts/update-testRunner-resources.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/bash
-
-set -e
-
-# Go to project root
-cd "$(dirname -- "$0")/.."
-
-# Download latest files
-cd lib/middleware/testRunner
-curl -L -O https://github.com/SAP/openui5/raw/master/src/sap.ui.core/test/sap/ui/qunit/TestRunner.js
-curl -L -O https://github.com/SAP/openui5/raw/master/src/sap.ui.core/test/sap/ui/qunit/testrunner.css
-curl -L -O https://github.com/SAP/openui5/raw/master/src/sap.ui.core/test/sap/ui/qunit/testrunner.html
-
-# Check if there are updates
-git diff --quiet && echo "No updates. Exiting..." && exit 0
-
-# Get latest commit url for src/sap.ui.core/test/sap/ui/qunit path
-COMMIT_URL=$(curl "https://api.github.com/repos/SAP/openui5/commits?sha=master&path=src/sap.ui.core/test/sap/ui/qunit" | \
-node -r fs -e "process.stdout.write(JSON.parse(fs.readFileSync(\"/dev/stdin\", \"utf8\"))[0].html_url)")
-
-echo "Creating new commit..."
-
-# Add changes and create commit
-git add .
-git commit \
--m "[FIX] middleware/testRunner: Update resources from OpenUI5" \
--m "Based on:
-$COMMIT_URL"
diff --git a/packages/server/test/lib/server/main.js b/packages/server/test/lib/server/main.js
index a32b33e68a6..1044fef7016 100644
--- a/packages/server/test/lib/server/main.js
+++ b/packages/server/test/lib/server/main.js
@@ -686,13 +686,10 @@ test("CSP with ignore paths", async (t) => {
 		simpleIndex: false,
 		ui5DataDir: isolatedUi5DataDir(t),
 	});
-	const testrunnerRequest1 = request.get("/test-resources/sap/ui/qunit/testrunner.html")
-		.expect(200);
+	const testrunnerRequest1 = request.get("/test-resources/sap/ui/qunit/testrunner.html");
 	const testrunnerRequest2 = request.get("/index.html")
-		.set("Referer", `http://localhost:${port}/test-resources/sap/ui/qunit/testrunner.html`)
-		.expect(200);
-	const testrunnerRequest3 = request.get("/index.html")
-		.expect(200);
+		.set("Referer", `http://localhost:${port}/test-resources/sap/ui/qunit/testrunner.html`);
+	const testrunnerRequest3 = request.get("/index.html");
 	const [response1, response2, response3] = await Promise.all([
 		testrunnerRequest1, testrunnerRequest2, testrunnerRequest3
 	]);
diff --git a/packages/server/test/lib/server/middleware/MiddlewareManager.js b/packages/server/test/lib/server/middleware/MiddlewareManager.js
index f528d3c1413..a73a16c9776 100644
--- a/packages/server/test/lib/server/middleware/MiddlewareManager.js
+++ b/packages/server/test/lib/server/middleware/MiddlewareManager.js
@@ -235,17 +235,16 @@ test("addMiddleware: Add middleware with afterMiddleware referencing removed mid
 		mountPath: "/pony"
 	});
 
-	// Custom middleware should be placed after testRunner (predecessor of serveThemes)
-	const testRunnerIdx = middlewareManager.middlewareExecutionOrder.indexOf("testRunner");
+	// Custom middleware should be placed in the slot the removed serveThemes originally occupied,
+	// i.e. directly after the serveThemes placeholder (and therefore directly before versionInfo).
+	const serveThemesIdx = middlewareManager.middlewareExecutionOrder.indexOf("serveThemes");
 	const customIdx = middlewareManager.middlewareExecutionOrder.indexOf("customMiddleware");
-	t.is(customIdx, testRunnerIdx + 1,
-		"Custom middleware is placed right after testRunner (predecessor of removed serveThemes)");
+	t.is(customIdx, serveThemesIdx + 1,
+		"Custom middleware is placed right after the serveThemes placeholder (original slot)");
 
 	t.is(warnSpy.callCount, 1, "Warning was logged");
 	t.true(warnSpy.getCall(0).args[0].includes("serveThemes"),
 		"Warning message mentions removed middleware");
-	t.true(warnSpy.getCall(0).args[0].includes("testRunner"),
-		"Warning message mentions fallback target");
 	t.true(warnSpy.getCall(0).args[0].includes("migrate-v5"),
 		"Warning message includes migration guide URL");
 });
@@ -274,17 +273,15 @@ test("addMiddleware: Add middleware with beforeMiddleware referencing removed mi
 		mountPath: "/pony"
 	});
 
-	// Custom middleware should be placed before versionInfo (successor of serveThemes)
-	const versionInfoIdx = middlewareManager.middlewareExecutionOrder.indexOf("versionInfo");
+	// Custom middleware should be placed directly before the serveThemes placeholder
+	const serveThemesIdx = middlewareManager.middlewareExecutionOrder.indexOf("serveThemes");
 	const customIdx = middlewareManager.middlewareExecutionOrder.indexOf("customMiddleware");
-	t.is(customIdx, versionInfoIdx - 1,
-		"Custom middleware is placed right before versionInfo (successor of removed serveThemes)");
+	t.is(customIdx, serveThemesIdx - 1,
+		"Custom middleware is placed right before the serveThemes placeholder (original slot)");
 
 	t.is(warnSpy.callCount, 1, "Warning was logged");
 	t.true(warnSpy.getCall(0).args[0].includes("serveThemes"),
 		"Warning message mentions removed middleware");
-	t.true(warnSpy.getCall(0).args[0].includes("versionInfo"),
-		"Warning message mentions fallback target");
 	t.true(warnSpy.getCall(0).args[0].includes("migrate-v5"),
 		"Warning message includes migration guide URL");
 });
@@ -316,20 +313,174 @@ test("addMiddleware: Multiple custom middlewares referencing removed middleware"
 		afterMiddleware: "serveThemes"
 	});
 
-	// Both should be placed after testRunner (predecessor of serveThemes)
-	// Since both reference the same position, they end up in reverse insertion order
-	const testRunnerIdx = middlewareManager.middlewareExecutionOrder.indexOf("testRunner");
+	// Both reference the same slot (right after the serveThemes placeholder).
+	// As with any two customs sharing a slot, they end up in reverse insertion order.
+	const serveThemesIdx = middlewareManager.middlewareExecutionOrder.indexOf("serveThemes");
 	const custom1Idx = middlewareManager.middlewareExecutionOrder.indexOf("customMiddleware1");
 	const custom2Idx = middlewareManager.middlewareExecutionOrder.indexOf("customMiddleware2");
 
-	t.is(custom2Idx, testRunnerIdx + 1,
-		"Second custom middleware is placed right after testRunner (inserted last)");
-	t.is(custom1Idx, testRunnerIdx + 2,
+	t.is(custom2Idx, serveThemesIdx + 1,
+		"Second custom middleware is placed right after the serveThemes placeholder (inserted last)");
+	t.is(custom1Idx, serveThemesIdx + 2,
 		"First custom middleware is placed after the second one (was pushed forward)");
 
 	t.is(warnSpy.callCount, 2, "Warning was logged for both middlewares");
 });
 
+test("addMiddleware: Add middleware with afterMiddleware referencing removed testRunner", async (t) => {
+	const {sinon} = t.context;
+	const warnSpy = sinon.spy();
+	const StubbedMiddlewareManager = await esmock("../../../../lib/middleware/MiddlewareManager.js", {
+		"@ui5/logger": {getLogger: sinon.stub().returns({warn: warnSpy})}
+	});
+	const middlewareManager = new StubbedMiddlewareManager({
+		graph: {},
+		rootProject: "root project",
+		resources: {
+			all: "I",
+			rootProject: "like",
+			dependencies: "ponies"
+		}
+	});
+
+	await middlewareManager.addStandardMiddleware();
+
+	await middlewareManager.addMiddleware("customMiddleware", {
+		customMiddleware: () => {},
+		afterMiddleware: "testRunner",
+		mountPath: "/pony"
+	});
+
+	// Custom middleware should be placed directly after the testRunner placeholder,
+	// preserving the original testRunner slot (between testRunner and serveThemes).
+	const testRunnerIdx = middlewareManager.middlewareExecutionOrder.indexOf("testRunner");
+	const customIdx = middlewareManager.middlewareExecutionOrder.indexOf("customMiddleware");
+	t.is(customIdx, testRunnerIdx + 1,
+		"Custom middleware is placed right after the testRunner placeholder (original slot)");
+
+	t.is(warnSpy.callCount, 1, "Warning was logged");
+	t.true(warnSpy.getCall(0).args[0].includes("testRunner"),
+		"Warning message mentions removed middleware");
+	t.true(warnSpy.getCall(0).args[0].includes("migrate-v5"),
+		"Warning message includes migration guide URL");
+});
+
+test("addMiddleware: Add middleware with beforeMiddleware referencing removed testRunner", async (t) => {
+	const {sinon} = t.context;
+	const warnSpy = sinon.spy();
+	const StubbedMiddlewareManager = await esmock("../../../../lib/middleware/MiddlewareManager.js", {
+		"@ui5/logger": {getLogger: sinon.stub().returns({warn: warnSpy})}
+	});
+	const middlewareManager = new StubbedMiddlewareManager({
+		graph: {},
+		rootProject: "root project",
+		resources: {
+			all: "I",
+			rootProject: "like",
+			dependencies: "ponies"
+		}
+	});
+
+	await middlewareManager.addStandardMiddleware();
+
+	await middlewareManager.addMiddleware("customMiddleware", {
+		customMiddleware: () => {},
+		beforeMiddleware: "testRunner",
+		mountPath: "/pony"
+	});
+
+	// Custom middleware should be placed directly before the testRunner placeholder
+	const testRunnerIdx = middlewareManager.middlewareExecutionOrder.indexOf("testRunner");
+	const customIdx = middlewareManager.middlewareExecutionOrder.indexOf("customMiddleware");
+	t.is(customIdx, testRunnerIdx - 1,
+		"Custom middleware is placed right before the testRunner placeholder (original slot)");
+
+	t.is(warnSpy.callCount, 1, "Warning was logged");
+	t.true(warnSpy.getCall(0).args[0].includes("testRunner"),
+		"Warning message mentions removed middleware");
+	t.true(warnSpy.getCall(0).args[0].includes("migrate-v5"),
+		"Warning message includes migration guide URL");
+});
+
+test("addMiddleware: Order between customs referencing different removed middlewares is preserved", async (t) => {
+	const {sinon} = t.context;
+	const warnSpy = sinon.spy();
+	const StubbedMiddlewareManager = await esmock("../../../../lib/middleware/MiddlewareManager.js", {
+		"@ui5/logger": {getLogger: sinon.stub().returns({warn: warnSpy})}
+	});
+	const middlewareManager = new StubbedMiddlewareManager({
+		graph: {},
+		rootProject: "root project",
+		resources: {
+			all: "I",
+			rootProject: "like",
+			dependencies: "ponies"
+		}
+	});
+
+	await middlewareManager.addStandardMiddleware();
+
+	// Original execution order before removal was:
+	//   serveResources → testRunner → serveThemes → versionInfo
+	// "afterMiddleware: testRunner" originally executed before "afterMiddleware: serveThemes".
+	await middlewareManager.addMiddleware("afterTestRunner", {
+		customMiddleware: () => {},
+		afterMiddleware: "testRunner"
+	});
+	await middlewareManager.addMiddleware("afterServeThemes", {
+		customMiddleware: () => {},
+		afterMiddleware: "serveThemes"
+	});
+
+	const afterTestRunnerIdx = middlewareManager.middlewareExecutionOrder.indexOf("afterTestRunner");
+	const afterServeThemesIdx = middlewareManager.middlewareExecutionOrder.indexOf("afterServeThemes");
+	t.true(afterTestRunnerIdx < afterServeThemesIdx,
+		"Custom middleware referencing testRunner executes before one referencing serveThemes, " +
+		"preserving the original relative order");
+});
+
+test("applyMiddleware: Legacy placeholders are not mounted on the app", async (t) => {
+	const {sinon} = t.context;
+	const warnSpy = sinon.spy();
+	const StubbedMiddlewareManager = await esmock("../../../../lib/middleware/MiddlewareManager.js", {
+		"@ui5/logger": {getLogger: sinon.stub().returns({warn: warnSpy})}
+	});
+	const middlewareManager = new StubbedMiddlewareManager({
+		graph: {
+			getRoot: () => ({
+				getName: () => "my project",
+				getCustomMiddleware: () => []
+			})
+		},
+		rootProject: "root project",
+		resources: {
+			all: "I",
+			rootProject: "like",
+			dependencies: "ponies"
+		}
+	});
+
+	const appUseStub = sinon.stub();
+	const result = await middlewareManager.applyMiddleware({use: appUseStub});
+
+	t.true(middlewareManager.middlewareExecutionOrder.includes("testRunner"),
+		"testRunner placeholder is part of the execution order");
+	t.true(middlewareManager.middlewareExecutionOrder.includes("serveThemes"),
+		"serveThemes placeholder is part of the execution order");
+
+	// Two entries in the execution order are placeholders without a corresponding middleware,
+	// so app.use must be called exactly that many times less than there are execution-order entries.
+	t.is(appUseStub.callCount, middlewareManager.middlewareExecutionOrder.length - 2,
+		"app.use is called for every entry except the two legacy placeholders");
+	t.true(appUseStub.getCalls().every((call) => call.args[1] !== undefined),
+		"No placeholder was mounted as middleware");
+
+	// Returned array length must equal the number of actually mounted middlewares,
+	// not the number of execution-order entries (which includes the legacy placeholders).
+	t.is(result.length, appUseStub.callCount,
+		"applyMiddleware result length equals number of mounted middlewares");
+});
+
 test("addMiddleware: Add middleware with afterMiddleware parameter", async (t) => {
 	const middlewareManager = new MiddlewareManager({
 		graph: {},
@@ -459,10 +610,15 @@ test("addStandardMiddleware: Adds standard middleware in correct order", async (
 			dependencies: "ponies"
 		}
 	});
-	const addMiddlewareStub = sinon.stub(middlewareManager, "addMiddleware").resolves();
+	// Stub addMiddleware to also reflect added middlewares in middlewareExecutionOrder so that
+	// the relative position of the legacy placeholders (inserted directly into the execution order)
+	// can be asserted below.
+	const addMiddlewareStub = sinon.stub(middlewareManager, "addMiddleware").callsFake(async (name) => {
+		middlewareManager.middlewareExecutionOrder.push(name);
+	});
 	await middlewareManager.addStandardMiddleware();
 
-	t.is(addMiddlewareStub.callCount, 10, "Expected count of middleware got added");
+	t.is(addMiddlewareStub.callCount, 9, "Expected count of middleware got added");
 	const addedMiddlewareNames = [];
 	for (let i = 0; i < addMiddlewareStub.callCount; i++) {
 		addedMiddlewareNames.push(addMiddlewareStub.getCall(i).args[0]);
@@ -474,11 +630,27 @@ test("addStandardMiddleware: Adds standard middleware in correct order", async (
 		"liveReloadClient",
 		"discovery",
 		"serveResources",
-		"testRunner",
 		"versionInfo",
 		"nonReadRequests",
 		"serveIndex"
 	], "Correct order of standard middlewares");
+
+	// Legacy placeholders for removed standard middlewares are inserted directly into the
+	// execution order (not via addMiddleware) between serveResources and versionInfo so that
+	// custom middlewares referencing them keep their original slot.
+	t.deepEqual(middlewareManager.middlewareExecutionOrder, [
+		"csp",
+		"compression",
+		"cors",
+		"liveReloadClient",
+		"discovery",
+		"serveResources",
+		"testRunner",
+		"serveThemes",
+		"versionInfo",
+		"nonReadRequests",
+		"serveIndex"
+	], "Legacy placeholders are inserted between serveResources and versionInfo");
 });
 
 test("addCustomMiddleware: No custom middleware defined", async (t) => {
diff --git a/packages/server/test/lib/server/middleware/testRunner.js b/packages/server/test/lib/server/middleware/testRunner.js
deleted file mode 100644
index c8621fbfa63..00000000000
--- a/packages/server/test/lib/server/middleware/testRunner.js
+++ /dev/null
@@ -1,122 +0,0 @@
-import test from "ava";
-import sinon from "sinon";
-import esmock from "esmock";
-import path from "node:path";
-import fs from "graceful-fs";
-import {fileURLToPath} from "node:url";
-
-let testRunnerMiddleware;
-const baseResourcePath = fileURLToPath(new URL("../../../../lib/middleware/testRunner", import.meta.url));
-
-test.beforeEach(async (t) => {
-	t.context.readFileStub = sinon.stub(fs, "readFile").yieldsAsync(null, "👮");
-
-	// Re-require to ensure that mocked modules are used
-	testRunnerMiddleware = await esmock("../../../../lib/middleware/testRunner.js");
-});
-
-test.afterEach.always(() => {
-	sinon.restore();
-});
-
-function callMiddleware(reqPath) {
-	const middleware = testRunnerMiddleware({resources: {}});
-	return new Promise((resolve, reject) => {
-		const req = {
-			url: `http://localhost${reqPath}`
-		};
-		const res = {
-			setHeader: function() {},
-			writeHead: function(status, contentType) {},
-			end: function(content) {
-				resolve(content);
-			},
-		};
-		const next = function(err) {
-			if (err) {
-				reject(err);
-			} else {
-				resolve();
-			}
-		};
-		middleware(req, res, next);
-	});
-}
-
-test.serial("Serve testrunner.html", async (t) => {
-	const content1 = await callMiddleware("/test-resources/sap/ui/qunit/testrunner.html");
-
-	// call a second time to test caching
-	const content2 = await callMiddleware("/test-resources/sap/ui/qunit/testrunner.html");
-
-	t.is(t.context.readFileStub.callCount, 1, "fs.readFile got called once");
-	t.is(t.context.readFileStub.getCall(0).args[0], path.join(baseResourcePath, "testrunner.html"),
-		"fs.readFile got called with expected path");
-	t.deepEqual(t.context.readFileStub.getCall(0).args[1], {encoding: "utf8"},
-		"fs.readFile got called with expected options");
-
-	t.is(content1, "👮", "Correct content served");
-	t.is(content2, "👮", "Correct content served from cache");
-});
-
-test.serial("Serve testrunner.css", async (t) => {
-	const content1 = await callMiddleware("/test-resources/sap/ui/qunit/testrunner.css");
-
-	// call a second time to test caching
-	const content2 = await callMiddleware("/test-resources/sap/ui/qunit/testrunner.css");
-
-	t.is(t.context.readFileStub.callCount, 1, "fs.readFile got called once");
-	t.is(t.context.readFileStub.getCall(0).args[0], path.join(baseResourcePath, "testrunner.css"),
-		"fs.readFile got called with expected path");
-	t.deepEqual(t.context.readFileStub.getCall(0).args[1], {encoding: "utf8"},
-		"fs.readFile got called with expected options");
-
-	t.is(content1, "👮", "Correct content served");
-	t.is(content2, "👮", "Correct content served from cache");
-});
-
-test.serial("Serve TestRunner.js", async (t) => {
-	const content1 = await callMiddleware("/test-resources/sap/ui/qunit/TestRunner.js");
-
-	// call a second time to test caching
-	const content2 = await callMiddleware("/test-resources/sap/ui/qunit/TestRunner.js");
-
-	t.is(t.context.readFileStub.callCount, 1, "fs.readFile got called once");
-	t.is(t.context.readFileStub.getCall(0).args[0], path.join(baseResourcePath, "TestRunner.js"),
-		"fs.readFile got called with expected path");
-	t.deepEqual(t.context.readFileStub.getCall(0).args[1], {encoding: "utf8"},
-		"fs.readFile got called with expected options");
-
-	t.is(content1, "👮", "Correct content served");
-	t.is(content2, "👮", "Correct content served from cache");
-});
-
-test.serial("Request path variations that should work", async (t) => {
-	// Additional path segment at beginning
-	const content1 = await callMiddleware("/pony/test-resources/sap/ui/qunit/testrunner.html");
-
-	t.is(content1, "👮", "Correct content served");
-});
-
-test.serial("Request path variations that should *not* work", async (t) => {
-	// Uppercase path segments
-	const content1 = await callMiddleware("/test-resources/sap/ui/QUNIT/testrunner.html");
-
-	// Missing "test-resources" segment
-	const content2 = await callMiddleware("/sap/ui/qunit/testrunner.html");
-
-	// Incorrect case of file name
-	const content3 = await callMiddleware("/test-resources/sap/ui/qunit/TESTRUNNER.HTML");
-	const content4 = await callMiddleware("/test-resources/sap/ui/qunit/testrunner.js"); // Should be TestRunner.js
-
-	t.is(content1, undefined, "Request is not handled by middleware (next() called with undefined)");
-	t.is(content2, undefined, "Request is not handled by middleware (next() called with undefined)");
-	t.is(content3, undefined, "Request is not handled by middleware (next() called with undefined)");
-	t.is(content4, undefined, "Request is not handled by middleware (next() called with undefined)");
-});
-
-test.serial("Error should be thrown correctly", async (t) => {
-	t.context.readFileStub.yieldsAsync(new Error("My Error"));
-	const error = await t.throwsAsync(callMiddleware("/test-resources/sap/ui/qunit/testrunner.html"));
-	t.is(error.message, "My Error");
-});