diff --git a/.github/workflows/task.yml b/.github/workflows/task.yml
index 8f8044bf..f41cd4a8 100644
--- a/.github/workflows/task.yml
+++ b/.github/workflows/task.yml
@@ -174,7 +174,7 @@ jobs:
         if: ${{ always() }}
         run: |
           mkdir -p out/vscode
-          cp -r ../vscode-ansible/out/userdata/logs/* out/vscode || true
+          cp -r ../vscode-ansible/out/log/* out/vscode || echo "::error:: Copy logs failed"
 
       - name: Upload test logs
         if: ${{ always() }}
diff --git a/tools/test-setup.sh b/tools/test-setup.sh
index 869db09f..7b594598 100755
--- a/tools/test-setup.sh
+++ b/tools/test-setup.sh
@@ -68,7 +68,7 @@ if [[ -f "/usr/bin/apt-get" ]]; then
     INSTALL=0
     # qemu-user-static is required by podman on arm64
     # python3-dev is needed for headers as some packages might need to compile
-    DEBS=(curl git python3-dev python3-venv python3-pip qemu-user-static)
+    DEBS=(curl git python3-dev python3-venv python3-pip qemu-user-static xvfb x11-xserver-utils)
     for DEB in "${DEBS[@]}"; do
         [[ "$(dpkg-query --show --showformat='${db:Status-Status}\n' \
             "${DEB}" || true)" != 'installed' ]] && INSTALL=1
diff --git a/tools/vscode.sh b/tools/vscode.sh
index e6cc1962..3f6f9748 100755
--- a/tools/vscode.sh
+++ b/tools/vscode.sh
@@ -24,7 +24,8 @@ cleanup() {
 
 if [[ -f "/usr/bin/apt-get" ]]; then
   trap "cleanup" SIGINT SIGTERM ERR EXIT
-  xvfb-run --auto-servernum task devel -- ../ansible-language-server
+  sudo apt-get -qq install -y xvfb
+  xvfb-run -e /dev/stdout --auto-servernum task devel -- ../ansible-language-server
 else
   task devel -- ../ansible-language-server
 fi