diff --git a/.github/workflows/ci-nimbus.yml b/.github/workflows/ci-nimbus.yml
index e0d33f5..7f83914 100644
--- a/.github/workflows/ci-nimbus.yml
+++ b/.github/workflows/ci-nimbus.yml
@@ -51,6 +51,39 @@ jobs:
         with:
           submodules: true
 
+      - name: MSYS2 (Windows amd64)
+        if: runner.os == 'Windows' && matrix.target.cpu == 'amd64'
+        uses: msys2/setup-msys2@v2
+        with:
+          path-type: inherit
+          install: >-
+            base-devel
+            git
+            mingw-w64-x86_64-toolchain
+
+      - name: Restore Nim DLLs dependencies (Windows) from cache
+        if: runner.os == 'Windows'
+        id: windows-dlls-cache
+        uses: actions/cache@v2
+        with:
+          path: external/dlls
+          key: 'dlls'
+
+      - name: Install DLL dependencies (Windows)
+        if: >
+          steps.windows-dlls-cache.outputs.cache-hit != 'true' &&
+          runner.os == 'Windows'
+        run: |
+          mkdir external
+          curl -L "https://nim-lang.org/download/windeps.zip" -o external/windeps.zip
+          7z x external/windeps.zip -oexternal/dlls
+
+      - name: Path to cached dependencies (Windows)
+        if: >
+          runner.os == 'Windows'
+        run: |
+          echo '${{ github.workspace }}'"/external/dlls" >> $GITHUB_PATH
+
       - name: Derive environment variables
         run: |
           if [[ '${{ matrix.target.cpu }}' == 'amd64' ]]; then
diff --git a/Makefile b/Makefile
index a507610..5006316 100644
--- a/Makefile
+++ b/Makefile
@@ -63,7 +63,7 @@ update: | update-common
 # Builds and run a part of the test suite
 test: | build deps
 	echo -e $(BUILD_MSG) "$@" && \
-		$(ENV_SCRIPT) nim testAll $(NIM_PARAMS) config.nims
+		$(ENV_SCRIPT) nim test $(NIM_PARAMS) config.nims
 
 # usual cleaning
 clean: | clean-common