diff --git a/.vscode/settings.json b/.vscode/settings.json
index 25d5de5ca528f..cbcd2273bb465 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,7 +1,15 @@
+// Configure PSScriptAnalyzer settings
 {
+    "[powershell]": {
+        "editor.formatOnSave": true
+    },
+    "powershell.scriptAnalysis.settingsPath": "PSScriptAnalyzerSettings.psd1",
+    "powershell.codeFormatting.preset": "OTBS",
+    "powershell.codeFormatting.alignPropertyValuePairs": true,
+    "powershell.codeFormatting.ignoreOneLineBlock": true,
     "json.schemas": [
         {
-            "url": "https://raw.githubusercontent.com/lukesampson/scoop/master/schema.json",
+            "url": "https://raw.githubusercontent.com/ScoopInstaller/Scoop/master/schema.json",
             "fileMatch": [
                 "bucket/*.json"
             ]
@@ -9,6 +17,10 @@
     ],
     "files.exclude": {
         "**/.git": true,
-        "**/.DS_Store": true
+        "**/.svn": true,
+        "**/.hg": true,
+        "**/CVS": true,
+        "**/.DS_Store": true,
+        "**/tmp": true
     }
 }
diff --git a/Scoop-Bucket.Tests.ps1 b/Scoop-Bucket.Tests.ps1
index 5393a09ce8f96..5e620e890b281 100644
--- a/Scoop-Bucket.Tests.ps1
+++ b/Scoop-Bucket.Tests.ps1
@@ -1,2 +1,2 @@
-if(!$env:SCOOP_HOME) { $env:SCOOP_HOME = resolve-path (split-path (split-path (scoop which scoop))) }
+if (!$env:SCOOP_HOME) { $env:SCOOP_HOME = Resolve-Path (scoop prefix scoop) }
 . "$env:SCOOP_HOME\test\Import-Bucket-Tests.ps1"