diff --git a/.github/workflows/tests.yml b/.github/workflows/stack.yml
similarity index 71%
rename from .github/workflows/tests.yml
rename to .github/workflows/stack.yml
index 769d0972..4aac0a53 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/stack.yml
@@ -1,8 +1,8 @@
-name: Tests
+name: Stack
 
 on:
-  pull_request:
   push:
+  pull_request:
 
 jobs:
   build:
@@ -25,25 +25,31 @@ jobs:
       - name: Clone project
         uses: actions/checkout@v2
 
-      - name: Cache dependencies
-        uses: actions/cache@v2
-        with:
-          path: ~/.stack
-          key: ${{ runner.os }}-${{ matrix.resolver }}-${{ hashFiles(matrix.yaml) }}-${{ hashFiles('xmonad-contrib.cabal') }}
-          restore-keys: |
-            ${{ runner.os }}-${{ matrix.resolver }}-${{ hashFiles(matrix.yaml) }}-
-            ${{ runner.os }}-${{ matrix.resolver }}-
-
-      - name: Install dependencies
+      - name: Install C dependencies
         run: |
           set -ex
           sudo apt install -y \
             libx11-dev \
+            libxext-dev \
             libxft-dev \
+            libxinerama-dev \
             libxrandr-dev \
             libxss-dev \
             #
-      - name: Build and run tests
+
+      - name: Cache Haskell dependencies
+        uses: actions/cache@v2
+        with:
+          path: ~/.stack
+          key: ${{ runner.os }}-${{ matrix.resolver }}-${{ hashFiles(matrix.yaml) }}-${{ hashFiles('*.cabal') }}
+          restore-keys: |
+            ${{ runner.os }}-${{ matrix.resolver }}-${{ hashFiles(matrix.yaml) }}-
+            ${{ runner.os }}-${{ matrix.resolver }}-
+
+      - name: Build and test
         run: |
           set -ex
-          stack --stack-yaml=${{ matrix.yaml }} test --fast --no-terminal --resolver=${{ matrix.resolver }}
+          stack test \
+            --fast --no-terminal \
+            --stack-yaml=${{ matrix.yaml }} \
+            --resolver=${{ matrix.resolver }}