diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index e9bd58a94..7a62d9a99 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -91,19 +91,13 @@ jobs:
         run: |
           go test -tags=example -shuffle=on -v ./...
 
-      - name: go test (Wasm, Go 1.16 or older)
-        # TODO: Investigate times out on Windows. (#1313)
-        if: ${{ !startsWith(matrix.os, 'windows-') && (startsWith(matrix.go, '1.15.') || startsWith(matrix.go, '1.16.')) }}
-        run: |
-          env GOOS=js GOARCH=wasm go test -tags=example -v ./...
-          env GOOS=js GOARCH=wasm go test -tags=example,ebitenwebgl1 -v ./...
-
       - name: go test (Wasm)
         # TODO: Investigate times out on Windows. (#1313)
         if: ${{ !startsWith(matrix.os, 'windows-') && !startsWith(matrix.go, '1.15.') && !startsWith(matrix.go, '1.16.') }}
         run: |
-          env GOOS=js GOARCH=wasm go test -tags=example -shuffle=on -v ./...
-          env GOOS=js GOARCH=wasm go test -tags=example,ebitenwebgl1 -shuffle=on -v ./...
+          # TODO: Add -shuffle=on after agnivade/wasmbrowsertest#23 is fixed.
+          env GOOS=js GOARCH=wasm go test -tags=example -v ./...
+          env GOOS=js GOARCH=wasm go test -tags=example,ebitenwebgl1 -v ./...
 
       - name: Install ebitenmobile
         run: |