diff --git a/test/unit/browser/index.js b/test/unit/browser/index.js
index 5084f654f2962..41c52405e7364 100644
--- a/test/unit/browser/index.js
+++ b/test/unit/browser/index.js
@@ -24,9 +24,9 @@ const { randomBytes } = require('crypto');
 // opts
 const defaultReporterName = process.platform === 'win32' ? 'list' : 'spec';
 const optimist = require('optimist')
-	// .describe('grep', 'only run tests matching <pattern>').alias('grep', 'g').alias('grep', 'f').string('grep')
 	.describe('build', 'run with build output (out-build)').boolean('build')
 	.describe('run', 'only run tests matching <relative_file_path>').string('run')
+	.describe('glob', 'only run tests matching <pattern>').string('glob')
 	.describe('grep', 'only run tests matching <pattern>').alias('grep', 'g').alias('grep', 'f').string('grep')
 	.describe('debug', 'do not run browsers headless').alias('debug', ['debug-browser']).boolean('debug')
 	.describe('sequential', 'only run suites for a single browser at a time').boolean('sequential')
@@ -88,7 +88,7 @@ const testModules = (async function () {
 	} else {
 		// glob patterns (--glob)
 		const defaultGlob = '**/*.test.js';
-		const pattern = argv.run || defaultGlob;
+		const pattern = (argv.glob || defaultGlob).replace(new RegExp(`^(${out}|src)/`), '').replace(/\.ts$/, '.js');
 		isDefaultModules = pattern === defaultGlob;
 
 		promise = new Promise((resolve, reject) => {
diff --git a/test/unit/browser/renderer.html b/test/unit/browser/renderer.html
index ae6786964832c..517d9a58abb06 100644
--- a/test/unit/browser/renderer.html
+++ b/test/unit/browser/renderer.html
@@ -40,28 +40,38 @@
 		});
 	</script>
 
-	<!-- Depending on --build or not, load loader from known locations -->
-	<script src="../../../out/vs/loader.js"></script>
-	<script src="../../../out-build/vs/loader.js"></script>
-
 	<script>
 		const isBuild = urlParams.get('build');
 
-		// configure loader
-		const baseUrl = window.location.href;
-		require.config({
-			catchError: true,
-			baseUrl: urlParams.get('baseUrl'),
-			paths: {
-				vs: new URL(`../../../${!!isBuild ? 'out-build' : 'out'}/vs`, baseUrl).href,
-				assert: new URL('../assert.js', baseUrl).href,
-				sinon: new URL('../../../node_modules/sinon/pkg/sinon.js', baseUrl).href,
-				'sinon-test': new URL('../../../node_modules/sinon-test/dist/sinon-test.js', baseUrl).href,
-				xterm: new URL('../../../node_modules/xterm/lib/xterm.js', baseUrl).href,
-				'@vscode/iconv-lite-umd': new URL('../../../node_modules/@vscode/iconv-lite-umd/lib/iconv-lite-umd.js', baseUrl).href,
-				jschardet: new URL('../../../node_modules/jschardet/dist/jschardet.min.js', baseUrl).href
-			}
-		});
+		function loaderScript(href) {
+			return new Promise((resolve, reject) => {
+				const script = document.createElement('script');
+				script.src = href;
+				script.onload = () => resolve();
+				script.onerror = () => reject();
+				document.head.appendChild(script);
+			});
+		}
+
+		(async () => {
+			await loaderScript(`../../../${!!isBuild ? 'out-build' : 'out'}/vs/loader.js`);
+
+			// configure loader
+			const baseUrl = window.location.href;
+			require.config({
+				catchError: true,
+				baseUrl: urlParams.get('baseUrl'),
+				paths: {
+					vs: new URL(`../../../${!!isBuild ? 'out-build' : 'out'}/vs`, baseUrl).href,
+					assert: new URL('../assert.js', baseUrl).href,
+					sinon: new URL('../../../node_modules/sinon/pkg/sinon.js', baseUrl).href,
+					'sinon-test': new URL('../../../node_modules/sinon-test/dist/sinon-test.js', baseUrl).href,
+					xterm: new URL('../../../node_modules/xterm/lib/xterm.js', baseUrl).href,
+					'@vscode/iconv-lite-umd': new URL('../../../node_modules/@vscode/iconv-lite-umd/lib/iconv-lite-umd.js', baseUrl).href,
+					jschardet: new URL('../../../node_modules/jschardet/dist/jschardet.min.js', baseUrl).href
+				}
+			});
+		})();
 	</script>
 
 	<script>
@@ -178,7 +188,7 @@
 		if (Array.isArray(modules) && modules.length > 0) {
 			console.log('MANUALLY running tests', modules);
 
-			loadAndRun({modules}, true).then(() => console.log('done'), err => console.log(err));
+			loadAndRun({ modules }, true).then(() => console.log('done'), err => console.log(err));
 		}
 	</script>
 </body>