diff --git a/.github/workflows/check_fmt.yml b/.github/workflows/check_fmt_clippy.yml
similarity index 70%
rename from .github/workflows/check_fmt.yml
rename to .github/workflows/check_fmt_clippy.yml
index 6834dc2b..ef3d95b6 100644
--- a/.github/workflows/check_fmt.yml
+++ b/.github/workflows/check_fmt_clippy.yml
@@ -1,4 +1,4 @@
-name: Check formatting
+name: Formatting + Clippy
 
 on:
   push:
@@ -18,7 +18,7 @@ on:
 
 jobs:
   build:
-    name: Check Rust code formatting
+    name: Formatter and linter checks
     runs-on: ubuntu-18.04
 
     steps:
@@ -30,8 +30,12 @@ jobs:
     - name: Set up Rust nightly
       run: |
           rustup self update
-          rustup toolchain install nightly --component rustfmt
+          rustup toolchain install nightly --component rustfmt clippy rust-src
           rustup default nightly
+          cargo install cargo-xbuild
     - name: Run cargo fmt
       run: |
         ruby utils/fmt_all.rb --check
+    - name: Run cargo clippy
+      run: |
+        ruby utils/clippy_all.rb