diff --git a/.gitignore b/.gitignore
index 9b9b8027fb..4b24a1e860 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,17 +1,11 @@
-bin/
-examples/Release/
-examples/Tests/foo*.txt
-out/
-node_modules/
+.vscode-test/
 logs/
-modules/*
-sessions/*
-!modules/README.md
-vscode-powershell.zip
-vscps-preview.zip
+modules/
+node_modules/
+out/
+sessions/
+test/.vscode/
+
+test-results.xml
 *.vsix
-npm-debug.log
-.vscode-test/
 *.DS_Store
-test-results.xml
-test/.vscode/settings.json
diff --git a/test/features/ExternalApi.test.ts b/test/features/ExternalApi.test.ts
index 880773c46f..d252b54516 100644
--- a/test/features/ExternalApi.test.ts
+++ b/test/features/ExternalApi.test.ts
@@ -94,5 +94,5 @@ suite("ExternalApi feature - Other APIs", () => {
         assert.notStrictEqual(versionDetails.version, null);
 
         // Start up can take some time...so set the timeout to 30 seconds.
-    }).timeout(30000);
+    });
 });
diff --git a/test/features/ISECompatibility.test.ts b/test/features/ISECompatibility.test.ts
index 7fac60591d..bebd34483b 100644
--- a/test/features/ISECompatibility.test.ts
+++ b/test/features/ISECompatibility.test.ts
@@ -43,7 +43,7 @@ suite("ISECompatibility feature", () => {
             const currently = vscode.workspace.getConfiguration(iseSetting.path).get(iseSetting.name);
             assert.notStrictEqual(currently, iseSetting.value);
         }
-    }).timeout(10000);
+    });
 
     test("It doesn't change theme when disabled if theme was manually changed after being enabled", async () => {
         assert.strictEqual(vscode.workspace.getConfiguration("workbench").get("colorTheme"), "PowerShell ISE");
@@ -58,5 +58,5 @@ suite("ISECompatibility feature", () => {
             assert.notStrictEqual(currently, iseSetting.value);
         }
         assert.strictEqual(vscode.workspace.getConfiguration("workbench").get("colorTheme"), "Monokai");
-    }).timeout(10000);
+    });
 });
diff --git a/test/features/RunCode.test.ts b/test/features/RunCode.test.ts
index 226c02138c..6ed3fc0fa3 100644
--- a/test/features/RunCode.test.ts
+++ b/test/features/RunCode.test.ts
@@ -56,7 +56,6 @@ suite("RunCode tests", () => {
         // it to run, and then kill it for safety's sake.
         assert(await vscode.commands.executeCommand("PowerShell.RunPesterTestsFromFile"));
         assert(vscode.debug.activeDebugSession !== undefined);
-        await sleep(5000);
         await vscode.debug.stopDebugging();
-    }).timeout(30000);
+    });
 });
diff --git a/test/index.ts b/test/index.ts
index 266985a429..af9d9c3494 100644
--- a/test/index.ts
+++ b/test/index.ts
@@ -14,7 +14,7 @@ export function run(): Promise<void> {
         ui: "tdd",
         color: !process.env.TF_BUILD, // colored output from test results
         reporter: "mocha-multi-reporters",
-        timeout: 5000,
+        timeout: 30000, // 30s because PowerShell startup is slow!
         reporterOptions: {
             // NOTE: The XML output by Mocha's xUnit reporter is actually in the
             // JUnit style. I'm unsure how no one else has noticed this.