diff --git a/CHANGELOG.md b/CHANGELOG.md
index e1347ee..e90d413 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## Unreleased
+
+### Fixes
+
+- sentry-server.py - The scriptroot is being set as `WorkingDirectory`.
+
 ## 2.8.0
 
 ### Fixes
diff --git a/sentry-cli/integration-test/action.psm1 b/sentry-cli/integration-test/action.psm1
index 4d78906..73b2fbf 100644
--- a/sentry-cli/integration-test/action.psm1
+++ b/sentry-cli/integration-test/action.psm1
@@ -74,7 +74,7 @@ function RunApiServer([string] $ServerScript, [string] $Uri = $ServerUri)
     $result.errFile = New-TemporaryFile
 
     $result.process = Start-Process "python3" -ArgumentList @("$PSScriptRoot/$ServerScript.py", $Uri) `
-        -NoNewWindow -PassThru -RedirectStandardOutput $result.outFile -RedirectStandardError $result.errFile
+        -NoNewWindow -PassThru -RedirectStandardOutput $result.outFile -RedirectStandardError $result.errFile -WorkingDirectory $PSScriptRoot
 
     $out = New-Object InvokeSentryResult
     $out.ServerStdOut = @()
diff --git a/sentry-cli/integration-test/tests/action.Tests.ps1 b/sentry-cli/integration-test/tests/action.Tests.ps1
index e40a90e..ce8e1a1 100644
--- a/sentry-cli/integration-test/tests/action.Tests.ps1
+++ b/sentry-cli/integration-test/tests/action.Tests.ps1
@@ -43,6 +43,14 @@ Describe 'Invoke-SentryServer' {
         $result.UploadedDebugFiles() | Should -Be @('file3.dylib', 'file2.so', 'file1.dll')
     }
 
+    It "collects proguard mapping" {
+        $result = Invoke-SentryServer {
+            Param([string]$url)
+            Invoke-WebRequest -Uri "$url/api/0/projects/org/project/files/dsyms/associate/" -Method Post `
+        }
+        Should -ActualValue $result.HasErrors() -BeFalse
+    }
+
     It "collects envelopes" {
         $result = Invoke-SentryServer {
             Param([string]$url)