diff --git a/test/smoke/src/main.ts b/test/smoke/src/main.ts
index 214713f213d..65626aaca28 100644
--- a/test/smoke/src/main.ts
+++ b/test/smoke/src/main.ts
@@ -48,7 +48,7 @@ if (program.stable) {
 	process.env.VSCODE_STABLE_PATH = program.stable;
 }
 process.env.SMOKETEST_REPO = testRepoLocalDir;
-if (program.stable && program.stable.toLowerCase().startsWith('insiders')) {
+if (program.latest && program.latest.indexOf('Code - Insiders') >= 0) {
 	process.env.VSCODE_EDITION = 'insiders';
 }
 process.env.VSCODE_WORKSPACE_PATH = codeWorkspace;
diff --git a/test/smoke/src/test.ts b/test/smoke/src/test.ts
index 0febbce1012..3eb91634c19 100644
--- a/test/smoke/src/test.ts
+++ b/test/smoke/src/test.ts
@@ -34,5 +34,7 @@ describe('Smoke Test Suite', () => {
 	testTasks();
 	testExtensions();
 	testLocalization();
-	testMultiRoot();
+	if (process.env.VSCODE_EDITION === 'insiders') {
+		testMultiRoot(); // only enabled in insiders
+	}
 });
\ No newline at end of file