diff --git a/test/automation/src/sql/configurePythonDialog.ts b/test/automation/src/sql/configurePythonDialog.ts
index af933e7752..471599b255 100644
--- a/test/automation/src/sql/configurePythonDialog.ts
+++ b/test/automation/src/sql/configurePythonDialog.ts
@@ -9,6 +9,10 @@ import { Dialog } from './dialog';
 const CONFIGURE_PYTHON_DIALOG_TITLE = 'Configure Python to run Python 3 kernel';
 
 export class ConfigurePythonDialog extends Dialog {
+	private static readonly dialogPageInView = '.modal .modal-body .dialogModal-pane:not(.dialogModal-hidden)';
+	private static readonly dialogButtonInView = '.modal .modal-footer .footer-button:not(.dialogModal-hidden)';
+	private static readonly nextButton = `${ConfigurePythonDialog.dialogButtonInView} a[aria-label="Next"][aria-disabled="false"]`;
+	private static readonly installButton = `${ConfigurePythonDialog.dialogButtonInView} a[aria-label="Install"][aria-disabled="false"]`;
 
 	constructor(code: Code) {
 		super(CONFIGURE_PYTHON_DIALOG_TITLE, code);
@@ -18,26 +22,28 @@ export class ConfigurePythonDialog extends Dialog {
 		await this.waitForNewDialog();
 	}
 
-	async installPython(): Promise<void> {
-		const dialogPageInView = '.modal .modal-body .dialogModal-pane:not(.dialogModal-hidden)';
-		const dialogButtonInView = '.modal .modal-footer .footer-button:not(.dialogModal-hidden)';
-
-		// Wait up to 1 minute for the python install location to be loaded before clicking the next button.
-		// There may be a timing issue where the smoke test attempts to go to the next page before
-		// the contents are loaded, causing the test to fail.
-		const pythonInstallLocationDropdownValue = `${dialogPageInView} option[value*="/azuredatastudio-python (Default)"]`;
+	async waitForPageOneLoaded(): Promise<void> {
+		// Wait up to 1 minute for the python install location to be loaded.
+		const pythonInstallLocationDropdownValue = `${ConfigurePythonDialog.dialogPageInView} option[value*="/azuredatastudio-python (Default)"]`;
 		await this.code.waitForElement(pythonInstallLocationDropdownValue, undefined, 600);
 
-		const loadingSpinner = `${dialogPageInView} .modelview-loadingComponent-content-loading`;
+		const loadingSpinner = `${ConfigurePythonDialog.dialogPageInView} .modelview-loadingComponent-content-loading`;
 		await this.code.waitForElementGone(loadingSpinner);
 
-		const nextButton = `${dialogButtonInView} a[aria-label="Next"][aria-disabled="false"]`;
-		await this.code.waitAndClick(nextButton);
+		await this.code.waitForElement(ConfigurePythonDialog.nextButton);
+	}
 
-		const installButton = `${dialogButtonInView} a[aria-label="Install"][aria-disabled="false"]`;
-		// wait up to 1 minute for the required kernel dependencies to load before clicking install button
-		await this.code.waitForElement(installButton, undefined, 600);
-		await this.code.waitAndClick(installButton);
+	async waitForPageTwoLoaded(): Promise<void> {
+		// Wait up to 1 minute for the required kernel dependencies to load before clicking install button
+		await this.code.waitForElement(ConfigurePythonDialog.installButton, undefined, 600);
+	}
+
+	async next(): Promise<void> {
+		await this.code.waitAndClick(ConfigurePythonDialog.nextButton);
+	}
+
+	async install(): Promise<void> {
+		await this.code.waitAndClick(ConfigurePythonDialog.installButton);
 
 		await this.waitForDialogGone();
 		return this._waitForInstallationComplete();
diff --git a/test/smoke/src/sql/areas/notebook/notebook.test.ts b/test/smoke/src/sql/areas/notebook/notebook.test.ts
index 2c78849a5e..8decc8d805 100644
--- a/test/smoke/src/sql/areas/notebook/notebook.test.ts
+++ b/test/smoke/src/sql/areas/notebook/notebook.test.ts
@@ -64,7 +64,15 @@ export function setup() {
 
 			await app.workbench.sqlNotebook.notebookToolbar.changeKernel('Python 3');
 			await app.workbench.configurePythonDialog.waitForConfigurePythonDialog();
-			await app.workbench.configurePythonDialog.installPython();
+			try {
+				await app.workbench.configurePythonDialog.waitForPageOneLoaded();
+			} catch (e) {
+				await app.captureScreenshot('Configure Python Dialog page one not loaded');
+				throw e;
+			}
+			await app.workbench.configurePythonDialog.next();
+			await app.workbench.configurePythonDialog.waitForPageTwoLoaded();
+			await app.workbench.configurePythonDialog.install();
 			await app.workbench.sqlNotebook.notebookToolbar.waitForKernel('Python 3');
 
 			await app.workbench.sqlNotebook.runActiveCell();