diff --git a/.github/workflows/Test.yml b/.github/workflows/Test.yml
index c78d591e9..cc147d3b4 100644
--- a/.github/workflows/Test.yml
+++ b/.github/workflows/Test.yml
@@ -18,29 +18,32 @@ jobs:
         - ubuntu
         - macOS
         go:
-        - 1.14.x
-        - 1.15.x
-        - 1.16.x
-    name: '${{ matrix.platform }} | ${{ matrix.go }}'
+        - 14
+        - 15
+        - 16
+    name: '${{ matrix.platform }} | 1.${{ matrix.go }}.x'
     runs-on: ${{ matrix.platform }}-latest
     steps:
 
     - uses: actions/setup-go@v2
       with:
-        go-version: ${{ matrix.go }}
+        go-version: 1.${{ matrix.go }}.x
 
     - uses: actions/checkout@v2
 
     - uses: actions/cache@v2
       with:
         path: ~/go/pkg/mod
-        key: ${{ runner.os }}-${{ matrix.go }}-${{ hashFiles('**/go.sum') }}
-        restore-keys: ${{ runner.os }}-${{ matrix.go }}-
+        key: ${{ runner.os }}-1.${{ matrix.go }}.x-${{ hashFiles('**/go.sum') }}
+        restore-keys: ${{ runner.os }}-1.${{ matrix.go }}.x-
 
     - run: |
         export GOBIN=$HOME/go/bin
         curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | bash -s -- -b $GOBIN latest
-        [ "${{ matrix.go }}" = "1.16.x" ] && _version='@latest' || _version=''
+        case "${{ matrix.go }}" in
+          16) _version='@latest';;
+          *) _version='';;
+        esac
         go install github.com/kyoh86/richgo"${_version}"
         go install github.com/mitchellh/gox"${_version}"