diff --git a/TGStationServer3.sln b/TGStationServer3.sln
index 2999ef57e4..fd74f4e3f9 100644
--- a/TGStationServer3.sln
+++ b/TGStationServer3.sln
@@ -78,10 +78,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{081BB0BB
 		Tools\CoverageExclusions.runsettings = Tools\CoverageExclusions.runsettings
 		Tools\DMAPITravisTester.dme = Tools\DMAPITravisTester.dme
 		Tools\Doxyfile = Tools\Doxyfile
-		Tools\GenCodeCovXML.ps1 = Tools\GenCodeCovXML.ps1
 		Tools\install_byond.sh = Tools\install_byond.sh
 		Tools\Test.dm = Tools\Test.dm
 		Tools\TGS3Build.ps1 = Tools\TGS3Build.ps1
+		Tools\UploadCoverage.ps1 = Tools\UploadCoverage.ps1
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".github", ".github", "{287B900C-1AFB-49B8-8BDD-C9058971C20C}"
diff --git a/Tools/GenCodeCovXML.ps1 b/Tools/UploadCoverage.ps1
similarity index 90%
rename from Tools/GenCodeCovXML.ps1
rename to Tools/UploadCoverage.ps1
index 90b7ed302e..59de7209d4 100644
--- a/Tools/GenCodeCovXML.ps1
+++ b/Tools/UploadCoverage.ps1
@@ -3,7 +3,7 @@ $coverageFilePath = Resolve-Path -path "TestResults\*\*.coverage"
 $coverageFilePath = $coverageFilePath.ToString()
 
 Write-Host "Running CodeCoverage.exe..."
-&"C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Team Tools\Dynamic Code Coverage Tools\CodeCoverage.exe" analyze /output:coverage.coveragexml "$coverageFilePath"
+&"C:\Program Files (x86)\Microsoft Visual Studio\2017\TestAgent\Team Tools\Dynamic Code Coverage Tools\CodeCoverage.exe" analyze /output:coverage.coveragexml "$coverageFilePath"
 
 rm -r TestResults
 
diff --git a/appveyor.yml b/appveyor.yml
index 0ad02e2883..60ea867874 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -34,8 +34,10 @@ after_build:
   - ps: if($env:APPVEYOR_REPO_COMMIT_MESSAGE -match "\[TGSDeploy\]"){$env:TGSDeploy = "Do it."}
   - ps: $env:TGSVersion = [System.Diagnostics.FileVersionInfo]::GetVersionInfo("$env:APPVEYOR_BUILD_FOLDER/TGServerService/bin/Release/TGServerService.exe").FileVersion
 test_script:
+  - set path=%ProgramFiles(x86)%\Microsoft Visual Studio\2017\TestAgent\Common7\IDE\CommonExtensions\Microsoft\TestWindow;%path%
+  - copy "%ProgramFiles(x86)%\Microsoft Visual Studio\2017\Community\Common7\IDE\CommonExtensions\Microsoft\TestWindow\Extensions\appveyor.*" "%ProgramFiles(x86)%\Microsoft Visual Studio\2017\TestAgent\Common7\IDE\CommonExtensions\Microsoft\TestWindow\Extensions" /y
   - vstest.console /logger:Appveyor "TGServiceTests\bin\Release\TGServiceTests.dll" /Enablecodecoverage /Settings:"Tools/CoverageExclusions.runsettings" /inIsolation /Platform:x64
-  - powershell -Command "Tools/GenCodeCovXML.ps1"
+  - powershell -Command "Tools/UploadCoverage.ps1"
 deploy:
   - provider: GitHub
     release: "tgstation-server-v$(TGSVersion)"