diff --git a/test/automation/src/code.ts b/test/automation/src/code.ts
index dcd75fe1e6f..34bd09b739e 100644
--- a/test/automation/src/code.ts
+++ b/test/automation/src/code.ts
@@ -140,6 +140,7 @@ export async function spawn(options: SpawnOptions): Promise<Code> {
 		'--disable-crash-reporter',
 		`--extensions-dir=${options.extensionsPath}`,
 		`--user-data-dir=${options.userDataDir}`,
+		`--disable-restore-windows`,
 		'--driver', handle
 	];
 
diff --git a/test/smoke/src/main.ts b/test/smoke/src/main.ts
index 8122d235289..a1273ba379d 100644
--- a/test/smoke/src/main.ts
+++ b/test/smoke/src/main.ts
@@ -57,8 +57,7 @@ const opts = minimist(args, {
 	boolean: [
 		'verbose',
 		'remote',
-		'web',
-		'ci'
+		'web'
 	],
 	default: {
 		verbose: false
@@ -299,24 +298,16 @@ describe(`VSCode Smoke Tests (${opts.web ? 'Web' : 'Electron'})`, () => {
 		});
 	}
 
-	// CI only tests (must be reliable)
-	if (opts.ci) {
-		// TODO@Ben figure out tests that can run continously and reliably
-	}
-
-	// Non-CI execution (all tests)
-	else {
-		if (!opts.web) { setupDataMigrationTests(opts['stable-build'], testDataPath); }
-		if (!opts.web) { setupDataLossTests(); }
-		if (!opts.web) { setupDataPreferencesTests(); }
-		setupDataSearchTests();
-		setupDataCSSTests();
-		setupDataEditorTests();
-		setupDataStatusbarTests(!!opts.web);
-		if (!opts.web) { setupDataExtensionTests(); }
-		setupTerminalTests();
-		if (!opts.web) { setupDataMultirootTests(); }
-		if (!opts.web) { setupDataLocalizationTests(); }
-		if (!opts.web) { setupLaunchTests(); }
-	}
+	if (!opts.web) { setupDataMigrationTests(opts['stable-build'], testDataPath); }
+	if (!opts.web) { setupDataLossTests(); }
+	if (!opts.web) { setupDataPreferencesTests(); }
+	setupDataSearchTests();
+	setupDataCSSTests();
+	setupDataEditorTests();
+	setupDataStatusbarTests(!!opts.web);
+	if (!opts.web) { setupDataExtensionTests(); }
+	setupTerminalTests();
+	if (!opts.web) { setupDataMultirootTests(); }
+	if (!opts.web) { setupDataLocalizationTests(); }
+	if (!opts.web) { setupLaunchTests(); }
 });