diff --git a/.github/workflows/hlint.yml b/.github/workflows/hlint.yml
new file mode 100644
index 0000000000..7bc8125c75
--- /dev/null
+++ b/.github/workflows/hlint.yml
@@ -0,0 +1,24 @@
+name: "HLint check"
+
+on:
+  pull_request:
+    branches:
+      - '**'
+
+jobs:
+  build10:
+    name: "Run"
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: 'Installing'
+      uses: rwe/actions-hlint-setup@v1
+      with:
+        version: '3.3.4'
+
+    - name: 'Checking code'
+      uses: rwe/actions-hlint-run@v1
+      with:
+        hlint-bin: "hlint --with-group=extra --hint=ghcide/.hlint.yaml"
+        path: '[ "ghcide/src", "ghcide/exe", "ghcide/bench/lib", "ghcide/bench/exe", "ghcide/bench/hist", "shake-bench/src", "ghcide/test/exe" ]'
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 3dafcdf2dd..50f07d0438 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -154,11 +154,7 @@ jobs:
                 ${{ env.cache-name }}-${{ runner.os }}-${{ matrix.ghc }}-
                 ${{ env.cache-name }}-${{ runner.os }}-
 
-      - run: cabal update
-
-      - name: "HLint via ./fmt.sh"
-        run: |
-          ./fmt.sh
+      - run: cabal v2-update
 
       # repeating builds to workaround segfaults in windows and ghc-8.8.4
       - name: Build