diff --git a/.vscode-test.js b/.vscode-test.js
index b85a6e77..6c1a4518 100644
--- a/.vscode-test.js
+++ b/.vscode-test.js
@@ -2,6 +2,9 @@ const { defineConfig } = require("@vscode/test-cli");
 
 module.exports = defineConfig({
   files: "out/test/**/*.test.js",
-  mocha: { ui: "bdd" },
+  mocha: {
+    ui: "bdd",
+    timeout: 5000,
+  },
   workspaceFolder: "test/bazel_workspace",
 });
diff --git a/package-lock.json b/package-lock.json
index 2cd3d7de..ee0ace07 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -6411,9 +6411,9 @@
             }
         },
         "node_modules/vscode-uri": {
-            "version": "3.0.2",
-            "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-3.0.2.tgz",
-            "integrity": "sha512-jkjy6pjU1fxUvI51P+gCsxg1u2n8LSt0W6KrCNQceaziKzff74GoWmjVG46KieVzybO1sttPQmYfrwSHey7GUA=="
+            "version": "3.1.0",
+            "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-3.1.0.tgz",
+            "integrity": "sha512-/BpdSx+yCQGnCvecbyXdxHDkuk55/G3xwnC0GqY4gmQ3j+A+g8kzzgB4Nk/SINjqn6+waqw3EgbVF2QKExkRxQ=="
         },
         "node_modules/which": {
             "version": "6.0.0",
@@ -11240,9 +11240,9 @@
             }
         },
         "vscode-uri": {
-            "version": "3.0.2",
-            "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-3.0.2.tgz",
-            "integrity": "sha512-jkjy6pjU1fxUvI51P+gCsxg1u2n8LSt0W6KrCNQceaziKzff74GoWmjVG46KieVzybO1sttPQmYfrwSHey7GUA=="
+            "version": "3.1.0",
+            "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-3.1.0.tgz",
+            "integrity": "sha512-/BpdSx+yCQGnCvecbyXdxHDkuk55/G3xwnC0GqY4gmQ3j+A+g8kzzgB4Nk/SINjqn6+waqw3EgbVF2QKExkRxQ=="
         },
         "which": {
             "version": "6.0.0",
diff --git a/test/bazel_workspace/buildifier/buildifier_good b/test/bazel_workspace/buildifier/buildifier_good
index dda325d2..9ddcf525 100755
--- a/test/bazel_workspace/buildifier/buildifier_good
+++ b/test/bazel_workspace/buildifier/buildifier_good
@@ -1,4 +1,6 @@
 #!/bin/bash
+# Read all input from stdin to prevent EPIPE errors
+cat > /dev/null
 echo '{
   "success": false,
   "files": [
diff --git a/test/bazel_workspace/buildifier/buildifier_old b/test/bazel_workspace/buildifier/buildifier_old
index 1c3e841e..b2bd9070 100755
--- a/test/bazel_workspace/buildifier/buildifier_old
+++ b/test/bazel_workspace/buildifier/buildifier_old
@@ -1,2 +1,4 @@
 #!/bin/bash
+# Read all input from stdin to prevent EPIPE errors
+cat > /dev/null
 echo 'Some output that is not valid JSON'
diff --git a/test/buildifier.test.ts b/test/buildifier.test.ts
index 709a8807..fbdc2eb4 100644
--- a/test/buildifier.test.ts
+++ b/test/buildifier.test.ts
@@ -10,24 +10,24 @@ async function openSourceFile(sourceFile: string) {
   await vscode.window.showTextDocument(doc, vscode.ViewColumn.One, false);
 }
 
-let disposables: vscode.Disposable[] = [];
+describe("buildifier", () => {
+  let disposables: vscode.Disposable[] = [];
 
-afterEach(() => {
-  for (const disposable of disposables) {
-    disposable.dispose();
-  }
-  disposables = [];
-});
+  afterEach(() => {
+    for (const disposable of disposables) {
+      disposable.dispose();
+    }
+    disposables = [];
+  });
 
-const workspacePath = path.join(
-  __dirname,
-  "..",
-  "..",
-  "test",
-  "bazel_workspace",
-);
+  const workspacePath = path.join(
+    __dirname,
+    "..",
+    "..",
+    "test",
+    "bazel_workspace",
+  );
 
-describe("buildifier", () => {
   it("diagnostics are added from buildifier", async () => {
     // Create DiagnosticsManager and open file
     const buildFile = path.join(workspacePath, "buildifier", "BUILD");
diff --git a/test/buildifier_availability.test.ts b/test/buildifier_availability.test.ts
index 57198805..c1140a35 100644
--- a/test/buildifier_availability.test.ts
+++ b/test/buildifier_availability.test.ts
@@ -30,24 +30,17 @@ describe("buildifier_availability", () => {
     process.env.PATH = buildifierDirPath + path.delimiter + process.env.PATH;
   }
 
-  async function removeVscodeSettings(): Promise<void> {
-    await fs.rm(path.join(testWorkspace, ".vscode"), {
-      recursive: true,
-      force: true,
-    });
-  }
-
   beforeEach(async () => {
     // Restore original PATH before each test
     process.env.PATH = originalPath;
-    // Remove vscode settings
-    await removeVscodeSettings();
+    // Restore vscode settings
+    await setBuildifierExecutableConfig(undefined);
   });
   afterEach(async () => {
     // Restore original PATH before each test
     process.env.PATH = originalPath;
-    // Remove vscode settings
-    await removeVscodeSettings();
+    // Restore vscode settings
+    await setBuildifierExecutableConfig(undefined);
   });
 
   describe("checkBuildifierIsAvailable", () => {