diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 26d2f97..d735539 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -10,26 +10,27 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+
     steps:
-      - name: Set up Python
-        uses: actions/setup-python@v1
-      - name: Install Python dependencies
-        run: |
-          python -m pip install --upgrade pip
-      - uses: actions/checkout@v2
-      - name: Install deps
+      - uses: actions/checkout@v4
+      - name: Install Dependencies
         run: |
-          sudo apt-get update
-          sudo apt-get install valac libgee-0.8-dev libgtk-4-dev libcairo-dev xvfb at-spi2-core
-          pip install meson
-          pip install ninja
+          sudo apt update
+          sudo apt install -y at-spi2-core libcairo-dev libgee-0.8-dev libgtk-4-dev meson valac xvfb
+
       - name: Build
+        env:
+          DESTDIR: out
         run: |
-          meson build -Ddebug=true -Db_coverage=true
-          ninja -C build
+          meson setup build -Ddebug=true -Db_coverage=true
+          ninja -C build install
+
       - name: Run tests
         run: |
-            meson test -C build --wrapper="xvfb-run --auto-servernum --server-num=1" || ([[ -f /home/runner/work/live-chart/live-chart/build/meson-logs/testlog-xvfb-run.txt ]] && cat /home/runner/work/live-chart/live-chart/build/meson-logs/testlog-xvfb-run.txt && exit 1)
+            meson test -C build || ([[ -f /home/runner/work/live-chart/live-chart/build/meson-logs/testlog-xvfb-run.txt ]] && cat /home/runner/work/live-chart/live-chart/build/meson-logs/testlog-xvfb-run.txt && exit 1)
 
   lint:
     name: Lint
diff --git a/tests/meson.build b/tests/meson.build
index d877461..593869e 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -1,3 +1,8 @@
+add_test_setup(
+    'headless',
+    exe_wrapper: [find_program('xvfb-run'), '--auto-servernum', '--server-num=1'],
+    is_default: true
+)
 
 test_sources = files(
     'area.vala',