diff --git a/.github/workflows/tests.yml b/.github/workflows/ci.yml
similarity index 76%
rename from .github/workflows/tests.yml
rename to .github/workflows/ci.yml
index 56fb04c0..0eae15be 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/ci.yml
@@ -1,8 +1,17 @@
-name: Tests
+name: CI
 on: ['push', 'pull_request']
 jobs:
-  build:
-    name: PHP ${{ matrix.php }} - ${{ matrix.os }} - ${{ matrix.dependency-version }}
+  phpstan:
+    name: PHP Static Analysis
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: PHPStan
+      uses: docker://oskarstark/phpstan-ga
+      with:
+        args: analyse src/
+  tests:
+    name: Unit Tests for PHP ${{ matrix.php }} - ${{ matrix.os }} - ${{ matrix.dependency-version }}
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
diff --git a/.github/workflows/static.yml b/.github/workflows/static.yml
deleted file mode 100644
index c7807a30..00000000
--- a/.github/workflows/static.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-name: Static Analysis
-on: [push, pull_request]
-jobs:
-  phpstan:
-    name: PHPStan
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-    - name: PHPStan
-      uses: docker://oskarstark/phpstan-ga
-      with:
-        args: analyse src/