diff --git a/package.json b/package.json
index a87b4265e7..6f6fefca25 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "azuredatastudio",
   "version": "1.35.0",
-  "distro": "8a2c23c492956322639d994a215dd196d00cf016",
+  "distro": "8607d90cebf220aefaaf0998f87d5e9c746e48b0",
   "author": {
     "name": "Microsoft Corporation"
   },
diff --git a/test/smoke/src/main.ts b/test/smoke/src/main.ts
index 9147d57c07..700bd3831f 100644
--- a/test/smoke/src/main.ts
+++ b/test/smoke/src/main.ts
@@ -360,7 +360,7 @@ after(async function () {
 	await new Promise((c, e) => rimraf(testDataPath, { maxBusyTries: 10 }, err => err ? e(err) : c(undefined)));
 });
 
-sqlMain(opts.web);
+sqlMain(opts);
 
 if (screenshotsPath) {
 	afterEach(async function () {
diff --git a/test/smoke/src/sql/areas/import/import.test.ts b/test/smoke/src/sql/areas/import/import.test.ts
index 3f90f47695..b3145ce886 100644
--- a/test/smoke/src/sql/areas/import/import.test.ts
+++ b/test/smoke/src/sql/areas/import/import.test.ts
@@ -4,9 +4,13 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { Application } from '../../../../../automation';
+import * as minimist from 'minimist';
+import { afterSuite, beforeSuite } from '../../../utils';
 
-export function setup() {
+export function setup(opts: minimist.ParsedArgs) {
 	describe('Import', () => {
+		beforeSuite(opts);
+		afterSuite(opts);
 
 		it('Opening import wizard without connection opens connection dialog', async function () {
 			const app = this.app as Application;
diff --git a/test/smoke/src/sql/areas/notebook/addRemoteBook.test.ts b/test/smoke/src/sql/areas/notebook/addRemoteBook.test.ts
index adb3ad6238..59510094c6 100644
--- a/test/smoke/src/sql/areas/notebook/addRemoteBook.test.ts
+++ b/test/smoke/src/sql/areas/notebook/addRemoteBook.test.ts
@@ -7,14 +7,17 @@ import { Application } from '../../../../../automation';
 import { promises as fs } from 'fs';
 import * as path from 'path';
 import { assert } from 'console';
+import * as minimist from 'minimist';
+import { afterSuite, beforeSuite } from '../../../utils';
 
 const AddRemoteBookCommand = 'Jupyter Books: Add Remote Jupyter Book';
 const JUPYTER_BOOK = 'CU';
 const VERSION = '1.0';
 const LANGUAGE = 'EN';
-export function setup() {
-
+export function setup(opts: minimist.ParsedArgs) {
 	describe('AddRemoteBookDialog', () => {
+		beforeSuite(opts);
+		afterSuite(opts);
 
 		it.skip('can open remote book', async function () { // Skip until the rate limit issue can be fixed
 			const app = this.app as Application;
diff --git a/test/smoke/src/sql/areas/notebook/createBook.test.ts b/test/smoke/src/sql/areas/notebook/createBook.test.ts
index 560e574845..4cd0c922b6 100644
--- a/test/smoke/src/sql/areas/notebook/createBook.test.ts
+++ b/test/smoke/src/sql/areas/notebook/createBook.test.ts
@@ -9,13 +9,16 @@ import * as rimraf from 'rimraf';
 import * as path from 'path';
 import { assert } from 'console';
 import * as tmp from 'tmp';
+import * as minimist from 'minimist';
+import { afterSuite, beforeSuite } from '../../../utils';
 
 const CreateBookCommand = 'Jupyter Books: Create Jupyter Book';
 const bookName = 'my-book';
 
-export function setup() {
-
+export function setup(opts: minimist.ParsedArgs) {
 	describe('CreateBookDialog', () => {
+		beforeSuite(opts);
+		afterSuite(opts);
 
 		let tmpDir = '';
 		it('can create new book with default content folder', async function () {
diff --git a/test/smoke/src/sql/areas/notebook/notebook.test.ts b/test/smoke/src/sql/areas/notebook/notebook.test.ts
index 45f1ae3452..a7761aaa23 100644
--- a/test/smoke/src/sql/areas/notebook/notebook.test.ts
+++ b/test/smoke/src/sql/areas/notebook/notebook.test.ts
@@ -4,9 +4,13 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { Application } from '../../../../../automation';
+import * as minimist from 'minimist';
+import { afterSuite, beforeSuite } from '../../../utils';
 
-export function setup() {
+export function setup(opts: minimist.ParsedArgs) {
 	describe('Notebook', () => {
+		beforeSuite(opts);
+		afterSuite(opts);
 
 		it('can perform basic text cell functionality', async function () {
 			const app = this.app as Application;
diff --git a/test/smoke/src/sql/areas/notebook/notebookView.test.ts b/test/smoke/src/sql/areas/notebook/notebookView.test.ts
index ab42ce59c2..ad5e42c238 100644
--- a/test/smoke/src/sql/areas/notebook/notebookView.test.ts
+++ b/test/smoke/src/sql/areas/notebook/notebookView.test.ts
@@ -5,9 +5,14 @@
 
 import { assert } from 'console';
 import { Application } from '../../../../../automation';
+import * as minimist from 'minimist';
+import { afterSuite, beforeSuite } from '../../../utils';
 
-export function setup() {
+export function setup(opts: minimist.ParsedArgs) {
 	describe('NotebookView', () => {
+		beforeSuite(opts);
+		afterSuite(opts);
+
 		it('Pin a notebook', async function () {
 			const app = this.app as Application;
 			await app.workbench.sqlNotebook.view.focusNotebooksView();
diff --git a/test/smoke/src/sql/areas/queryEditor/queryEditor.test.ts b/test/smoke/src/sql/areas/queryEditor/queryEditor.test.ts
index ba814e63f6..5062c0c434 100644
--- a/test/smoke/src/sql/areas/queryEditor/queryEditor.test.ts
+++ b/test/smoke/src/sql/areas/queryEditor/queryEditor.test.ts
@@ -4,10 +4,12 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { Application } from '../../../../../automation';
+import * as minimist from 'minimist';
+import { afterSuite, beforeSuite } from '../../../utils';
 
-export function setup() {
+export function setup(opts: minimist.ParsedArgs) {
 	describe('Query Editor', () => {
-		setupWeb();
+		setupCommonTests(opts);
 
 		it('can new file, connect and execute', async function () {
 			const app = this.app as Application;
@@ -27,7 +29,15 @@ export function setup() {
 	});
 }
 
-export function setupWeb() {
+export function setupWeb(opts: minimist.ParsedArgs) {
+	describe('Query Editor', () => {
+		setupCommonTests(opts);
+	});
+}
+
+function setupCommonTests(opts: minimist.ParsedArgs): void {
+	beforeSuite(opts);
+	afterSuite(opts);
 	afterEach(async function (): Promise<void> {
 		const app = this.app as Application;
 		await app.workbench.quickaccess.runCommand('workbench.action.closeAllEditors');
diff --git a/test/smoke/src/sql/main.ts b/test/smoke/src/sql/main.ts
index d11d5c60e8..3aec41bbfe 100644
--- a/test/smoke/src/sql/main.ts
+++ b/test/smoke/src/sql/main.ts
@@ -15,19 +15,20 @@ import * as fs from 'fs';
 import * as path from 'path';
 import { request } from 'https';
 import * as mkdirp from 'mkdirp';
+import * as minimist from 'minimist';
 
-export function main(isWeb: boolean = false): void {
-	if (isWeb) {
-		setupQueryEditorWebTests();
-		setupNotebookViewTests();
-		setupAddRemoteBookDialogTests();
+export function main(opts: minimist.ParsedArgs): void {
+	if (opts.web) {
+		setupQueryEditorWebTests(opts);
+		setupNotebookViewTests(opts);
+		setupAddRemoteBookDialogTests(opts);
 	} else {
-		setupQueryEditorTests();
-		setupNotebookTests();
-		setupNotebookViewTests();
-		setupCreateBookDialogTests();
-		setupAddRemoteBookDialogTests();
-		setupImportTests();
+		setupQueryEditorTests(opts);
+		setupNotebookTests(opts);
+		setupNotebookViewTests(opts);
+		setupCreateBookDialogTests(opts);
+		setupAddRemoteBookDialogTests(opts);
+		setupImportTests(opts);
 	}
 }
 
@@ -42,7 +43,7 @@ const sqliteUrl = `https://github.com/Microsoft/azuredatastudio-sqlite/releases/
 
 export async function setup(app: ApplicationOptions): Promise<void> {
 	console.log('*** Downloading test extensions');
-	const releaseVersion = app.web ? '1.6.0' : '1.5.0';
+	const releaseVersion = '1.7.0';
 	const requestUrl = sqliteUrl.replace(RELEASE_VERSION, releaseVersion).replace(PLATFORM, process.platform).replace(RUNTIME, getRuntime(app.web || app.remote || false)).replace(VERSION, getVersion(app.web || app.remote || false));
 	const zip = await fetch(requestUrl);
 	if (!zip) {