diff --git a/.github/workflows/Test.yml b/.github/workflows/test.yml
similarity index 81%
rename from .github/workflows/Test.yml
rename to .github/workflows/test.yml
index bc748030e..01396e639 100644
--- a/.github/workflows/Test.yml
+++ b/.github/workflows/test.yml
@@ -9,6 +9,20 @@ env:
 
 jobs:
 
+  golangci-lint:
+    runs-on: ubuntu-latest
+    steps:
+
+      - uses: actions/setup-go@v2
+        with:
+          go-version: '1.17'
+
+      - uses: actions/checkout@v2
+
+      - uses: golangci/golangci-lint-action@v2
+        with:
+          version: latest
+          args: --verbose
 
   test-unix:
     strategy:
@@ -40,7 +54,6 @@ jobs:
 
     - run: |
         export GOBIN=$HOME/go/bin
-        curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | bash -s -- -b $GOBIN latest
         case "${{ matrix.go }}" in
           16|17) _version='@latest';;
           *) _version='';;
@@ -48,8 +61,7 @@ jobs:
         go install github.com/kyoh86/richgo"${_version}"
         go install github.com/mitchellh/gox"${_version}"
 
-    - run: PATH=$HOME/go/bin/:$PATH make
-
+    - run: PATH=$HOME/go/bin/:$PATH make test cobra_generator
 
   test-win:
     name: MINGW64
@@ -82,8 +94,7 @@ jobs:
 
     - run: |
         export GOBIN=$HOME/go/bin
-        curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | bash -s -- -b $GOBIN latest
         go install github.com/kyoh86/richgo@latest
         go install github.com/mitchellh/gox@latest
 
-    - run: PATH=$HOME/go/bin:$PATH make
+    - run: PATH=$HOME/go/bin:$PATH make test cobra_generator
diff --git a/Makefile b/Makefile
index 472c73bf1..5880f04eb 100644
--- a/Makefile
+++ b/Makefile
@@ -23,7 +23,7 @@ lint:
 	$(info ******************** running lint tools ********************)
 	golangci-lint run -v
 
-test: install_deps lint
+test: install_deps
 	$(info ******************** running tests ********************)
 	richgo test -v ./...