diff --git a/src/e2e-tests/build.test.ts b/src/e2e-tests/build.test.ts
index 941c9d83..7706d9d1 100644
--- a/src/e2e-tests/build.test.ts
+++ b/src/e2e-tests/build.test.ts
@@ -141,6 +141,11 @@ test.describe('CMSIS Solution Build Validation', () => {
                     expect(vsCodeDriver.testWorkspaceDirectory).toBeDefined();
                     expect(vsCodeDriver.testWorkspaceDirectory).not.toBe(sourceWorkspace);
 
+                    await vsCodeDriver.page.openCmsisPanel();
+                    await vsCodeDriver.page.getCommands().runCommandFromPalette('CMSIS: Open Solution in Workspace');
+                    const firstWorkspaceItem = vsCodeDriver.page.getLocator('.quick-input-list .monaco-list-row').first();
+                    await firstWorkspaceItem.click();
+
                     try {
                         // ==================== STEP 2: Wait for Tool Activation ====================
                         log('info', '⏳ Waiting for Arm Environment Manager to activate tools...');
diff --git a/src/e2e-tests/infrastructure/vscode-driver.ts b/src/e2e-tests/infrastructure/vscode-driver.ts
index 8f2f9c8c..0fb439b8 100644
--- a/src/e2e-tests/infrastructure/vscode-driver.ts
+++ b/src/e2e-tests/infrastructure/vscode-driver.ts
@@ -220,6 +220,7 @@ export class VsCodeDriver {
         const runningApp = requireRunning(this.state);
 
         try {
+            await runningApp.pageDriver.getCommands().runCommandFromPalette('CMSIS: Close Solution');
             await runningApp.pageDriver.getCommands().runCommandFromPalette('View: Close All Editors');
             await runningApp.pageDriver.getCommands().runCommandFromPalette('Notifications: Clear All Notifications');
             await runningApp.pageDriver.getCommands().runCommandFromPalette('View: Kill All Terminals');