diff --git a/src/vs/workbench/browser/web.main.ts b/src/vs/workbench/browser/web.main.ts
index 1a47bd47cf8..d3bb53ad195 100644
--- a/src/vs/workbench/browser/web.main.ts
+++ b/src/vs/workbench/browser/web.main.ts
@@ -84,6 +84,11 @@ class CodeRendererMain extends Disposable {
 		}));
 		this._register(workbench.onShutdown(() => this.dispose()));
 
+		// Driver
+		if (this.configuration.driver) {
+			registerWindowDriver().then(d => this._register(d));
+		}
+
 		// Startup
 		workbench.startup();
 	}
diff --git a/test/smoke/src/vscode/puppeteerDriver.ts b/test/smoke/src/vscode/puppeteerDriver.ts
index 5d7b163b71c..70fa8ca0cc9 100644
--- a/test/smoke/src/vscode/puppeteerDriver.ts
+++ b/test/smoke/src/vscode/puppeteerDriver.ts
@@ -191,7 +191,7 @@ export async function launch(_args): Promise<void> {
 	// TODO: Don't open up the system browser
 	const webUserDataDir = join(tmpdir(), `smoketest-${Math.random() * 10000000000}`);
 	await promisify(mkdir)(webUserDataDir);
-	server = spawn(join(args[0], `resources/server/web.${process.platform === 'win32' ? 'bat' : 'sh'}`), ['--driver', 'web', '--web-user-data-dir', webUserDataDir]);
+	server = spawn(join(args[0], `resources/server/web.${process.platform === 'win32' ? 'bat' : 'sh'}`), ['--no-browser', '--driver', 'web', '--web-user-data-dir', webUserDataDir]);
 	server.stderr.on('data', e => console.log('Server stderr: ' + e));
 	process.on('exit', teardown);
 	endpoint = await waitForEndpoint();