diff --git a/.github/workflows/makefile.yml b/.github/workflows/makefile.yml
index c035af6..c24cbc8 100644
--- a/.github/workflows/makefile.yml
+++ b/.github/workflows/makefile.yml
@@ -116,8 +116,17 @@ jobs:
 
       - name: "Run tests"
         run: |
-          dir ${{ runner.workspace }}\\install\\lib
-          set LD_LIBRARY_PATH=${{ runner.workspace }}\\install\\lib
-          set COMMONAPI_CONFIG=${{ github.workspace }}\\src\\test\\commonapi-dbus.ini
-          cd ${{ runner.workspace }}\capicxx-dbus-runtime\build-dbus-runtime\src\test
-          ctest -C Debug --test-dir "${{ github.workspace }}\\src\\test" -V
+          $env:PATH += ";${{ runner.workspace }}\install\bin"
+          $env:PATH += ";${{ github.workspace }}\build-core-runtime\Debug"
+          $env:PATH += ";${{ github.workspace }}\build-dbus-runtime\Debug"
+          $dbus_daemon = Start-Job -ScriptBlock {
+            & ${{ runner.workspace }}\install\bin\dbus-daemon --config-file=${{ runner.workspace }}\install\share\dbus-1\session.conf --nofork --print-address
+          }
+          Start-Sleep -Seconds 1
+          $env:DBUS_SESSION_BUS_ADDRESS = Receive-Job $dbus_daemon
+          try {
+            ctest -C Debug --test-dir ${{ github.workspace }}\build-core-runtime -V
+            exit $LASTEXITCODE
+          } finally {
+            Stop-Job $dbus_daemon
+          }