diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 4f8303d9acdf..eea258566a9f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -205,6 +205,11 @@ jobs:
           git checkout "${SHIM_COMMIT}"
           GO111MODULE=on go build -mod=vendor -o "${bindir}/containerd-shim-runhcs-v1.exe" ./cmd/containerd-shim-runhcs-v1
 
+      - name: Tests
+        env:
+          CGO_ENABLED: 1
+        run: mingw32-make.exe test root-test
+
       - name: Integration 1
         env:
           CGO_ENABLED: 1
@@ -282,6 +287,15 @@ jobs:
           sudo make install
         working-directory: src/github.com/containerd/containerd
 
+      - name: Tests
+        env:
+          GOPROXY: direct
+          SKIPTESTS: github.com/containerd/containerd/snapshots/devmapper
+        run: |
+          make test
+          sudo -E PATH=$PATH GOPATH=$GOPATH GOPROXY=$GOPROXY make root-test
+        working-directory: src/github.com/containerd/containerd
+
       - name: Integration 1
         env:
           GOPROXY: direct