diff --git a/extensions/vscode-notebook-tests/src/notebook.test.ts b/extensions/vscode-notebook-tests/src/notebook.test.ts
index 270eacdb15b..7a03dc84d9f 100644
--- a/extensions/vscode-notebook-tests/src/notebook.test.ts
+++ b/extensions/vscode-notebook-tests/src/notebook.test.ts
@@ -214,7 +214,7 @@ suite('API tests', () => {
 		});
 	});
 
-	test('notebook editor active/visible', async function () {
+	test.skip('notebook editor active/visible', async function () {
 		const resource = vscode.Uri.file(join(vscode.workspace.rootPath || '', './first.vsctestnb'));
 		await vscode.commands.executeCommand('vscode.openWith', resource, 'notebookCoreTest');
 		const firstEditor = vscode.notebook.activeNotebookEditor;
@@ -230,6 +230,7 @@ suite('API tests', () => {
 		assert.equal(vscode.notebook.visibleNotebookEditors.length, 2);
 
 		await vscode.commands.executeCommand('workbench.action.files.newUntitledFile');
+		// TODO@rebornix, this is not safe, we might need to listen to visible editor change event.
 		assert.equal(firstEditor?.visible, true);
 		assert.equal(firstEditor?.active, false);
 		assert.equal(secondEditor?.visible, false);
@@ -594,7 +595,8 @@ suite('notebook working copy', () => {
 		assert.deepEqual(vscode.notebook.activeNotebookEditor?.document.cells.length, 1);
 		assert.equal(vscode.notebook.activeNotebookEditor?.selection?.source, 'test');
 
-		await vscode.commands.executeCommand('workbench.action.closeActiveEditor');
+		await vscode.commands.executeCommand('workbench.action.files.saveAll');
+		await vscode.commands.executeCommand('workbench.action.closeAllEditors');
 	});
 
 	test('multiple tabs: dirty + clean', async function () {