diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f9ade0e8c..ce3a5b6ea 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -26,6 +26,10 @@ jobs:
         os: [ubuntu-18.04, macos-10.15, windows-2019]
 
     steps:
+      - uses: actions/setup-go@v2
+        with:
+          go-version: ${{ matrix.go-version }}
+
       - uses: actions/checkout@v2
         with:
           path: src/github.com/containerd/containerd
@@ -41,6 +45,7 @@ jobs:
           version: v1.36.0
           working-directory: src/github.com/containerd/containerd
           args: --timeout=5m
+          skip-go-installation: true
 
   #
   # Project checks