diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index cb205f9fd..c0f03fdb9 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -11,8 +11,16 @@ jobs:
     steps:
 
     - uses: actions/checkout@v1
-    - name: clang-tidy check
+    - name: Install clang-tidy
       run: |
+        sudo apt-get install -y clang-tidy-9
+        sudo update-alternatives --install /usr/bin/clang-tidy clang-tidy /usr/bin/clang-tidy-9 100
+    - name: lint with clang-tidy
+      run: |
+        make lint
+      env:
+        CC: clang
+        CXX: clang++
 
   linux:
 
@@ -30,7 +38,6 @@ jobs:
             cpp: 'g++'
     env:
        CMAKE_OPTIONS: ${{ matrix.cmake_opts }}
-       CMAKE_CXX_CLANG_TIDY: "clang-tidy -checks=-*,readability-*"
        CC: ${{ matrix.compiler.c }}
        CXX: ${{ matrix.compiler.cpp }}
 
@@ -39,10 +46,6 @@ jobs:
     - name: Install valgrind
       run: |
          sudo apt install -y valgrind
-    - name: Install clang-tidy
-      run: |
-        sudo apt-get install -y clang-tidy-9
-        sudo update-alternatives --install /usr/bin/clang-tidy clang-tidy /usr/bin/clang-tidy-9 100
     - name: Build and test
       run: |
          make