diff --git a/buildkite/startup-windows-pdssd.ps1 b/buildkite/startup-windows-pdssd.ps1
index 7a1e833..bed28f0 100644
--- a/buildkite/startup-windows-pdssd.ps1
+++ b/buildkite/startup-windows-pdssd.ps1
@@ -22,6 +22,9 @@
 $env:TMP = [Environment]::GetEnvironmentVariable("TMP", "Machine")
 $env:PATH = [Environment]::GetEnvironmentVariable("PATH", "Machine")
 
+# Create a junction to the MSYS2 directory at a default path when installed with the installer.
+New-Item -ItemType Junction -Path "C:\msys64" -Target "C:\tools\msys64"
+
 ## Create an environment hook for the Buildkite agent.
 $myhostname = [System.Net.Dns]::GetHostName()
 if ($myhostname -like "*trusted*") {