diff --git a/test/smoke/src/main.ts b/test/smoke/src/main.ts
index 9bbb169a00..a226232c3b 100644
--- a/test/smoke/src/main.ts
+++ b/test/smoke/src/main.ts
@@ -277,26 +277,6 @@ after(async function () {
 });
 
 describe(`VSCode Smoke Tests (${opts.web ? 'Web' : 'Electron'})`, () => {
-	if (screenshotsPath) {
-		afterEach(async function () {
-			if (this.currentTest.state !== 'failed') {
-				return;
-			}
-			const app = this.app as Application;
-			const name = this.currentTest.fullTitle().replace(/[^a-z0-9\-]/ig, '_');
-
-			await app.captureScreenshot(name);
-		});
-	}
-
-	if (opts.log) {
-		beforeEach(async function () {
-			const app = this.app as Application;
-			const title = this.currentTest.fullTitle();
-
-			app.logger.log('*** Test start:', title);
-		});
-	}
 
 	/*if (!opts.web && opts['stable-build']) {
 		describe(`Stable vs Insiders Smoke Tests: This test MUST run before releasing by providing the --stable-build command line argument`, () => {
@@ -315,6 +295,27 @@ describe(`VSCode Smoke Tests (${opts.web ? 'Web' : 'Electron'})`, () => {
 			await this.app.stop();
 		});
 
+		if (screenshotsPath) {
+			afterEach(async function () {
+				if (this.currentTest.state !== 'failed') {
+					return;
+				}
+				const app = this.app as Application;
+				const name = this.currentTest.fullTitle().replace(/[^a-z0-9\-]/ig, '_');
+
+				await app.captureScreenshot(name);
+			});
+		}
+
+		if (opts.log) {
+			beforeEach(async function () {
+				const app = this.app as Application;
+				const title = this.currentTest.fullTitle();
+
+				app.logger.log('*** Test start:', title);
+			});
+		}
+
 		sqlMain(opts.web);
 		/*if (!opts.web) { setupDataLossTests(); }
 		if (!opts.web) { setupDataPreferencesTests(); }