diff --git a/test/automation/src/extensions.ts b/test/automation/src/extensions.ts
index cd4a7297871c2b9673dbab5fbbaaf193d0f2ef19..fa1fe2fc0ba75825ab461b2a8bf28e4c0dd3bae1 100644
--- a/test/automation/src/extensions.ts
+++ b/test/automation/src/extensions.ts
@@ -34,9 +34,13 @@ export class Extensions extends Viewlet {
 		await this.code.waitForTypeInEditor(SEARCH_BOX, `@id:${id}`);
 	}
 
-	async installExtension(id: string): Promise<void> {
+	async installExtension(id: string, waitUntilEnabled: boolean): Promise<void> {
 		await this.searchForExtension(id);
 		await this.code.waitAndClick(`div.extensions-viewlet[id="workbench.view.extensions"] .monaco-list-row[data-extension-id="${id}"] .extension-list-item .monaco-action-bar .action-item:not(.disabled) .extension-action.install`);
-		await this.code.waitForElement(`.extension-editor .monaco-action-bar .action-item:not(.disabled) .extension-action[title="Disable this extension"]`);
+		await this.code.waitForElement(`.extension-editor .monaco-action-bar .action-item:not(.disabled) .extension-action.uninstall`);
+		if (waitUntilEnabled) {
+			await this.code.waitForElement(`.extension-editor .monaco-action-bar .action-item:not(.disabled) .extension-action[title="Disable this extension"]`);
+		}
 	}
+
 }
diff --git a/test/smoke/src/areas/extensions/extensions.test.ts b/test/smoke/src/areas/extensions/extensions.test.ts
index 756980f5bae3e79c0fff07aadc306346c5813bb8..1deb87ebd1ec9988cb85e25ad17c81f8d14f9cd5 100644
--- a/test/smoke/src/areas/extensions/extensions.test.ts
+++ b/test/smoke/src/areas/extensions/extensions.test.ts
@@ -17,7 +17,7 @@ export function setup() {
 
 			await app.workbench.extensions.openExtensionsViewlet();
 
-			await app.workbench.extensions.installExtension('michelkaporin.vscode-smoketest-check');
+			await app.workbench.extensions.installExtension('michelkaporin.vscode-smoketest-check', true);
 
 			await app.workbench.extensions.waitForExtensionsViewlet();
 
diff --git a/test/smoke/src/areas/workbench/localization.test.ts b/test/smoke/src/areas/workbench/localization.test.ts
index 0fb5e0cb24789c21a5f9cd8a6f16ff195ba5a564..d0b5e698fad0374042905522d6a729815c259888 100644
--- a/test/smoke/src/areas/workbench/localization.test.ts
+++ b/test/smoke/src/areas/workbench/localization.test.ts
@@ -15,7 +15,7 @@ export function setup() {
 			}
 
 			await app.workbench.extensions.openExtensionsViewlet();
-			await app.workbench.extensions.installExtension('ms-ceintl.vscode-language-pack-de');
+			await app.workbench.extensions.installExtension('ms-ceintl.vscode-language-pack-de', false);
 
 			await app.restart({ extraArgs: ['--locale=DE'] });
 		});