diff --git a/ci/Dockerfile-mingw b/ci/Dockerfile-mingw
index ee5926c8d..b0acedc67 100644
--- a/ci/Dockerfile-mingw
+++ b/ci/Dockerfile-mingw
@@ -2,5 +2,5 @@ FROM ubuntu:16.04
 
 RUN apt-get update
 RUN apt-get install -y --no-install-recommends \
-  gcc ca-certificates make libc6-dev \
+  gcc ca-certificates cmake make nasm libc6-dev \
   gcc-mingw-w64-x86-64 libz-mingw-w64-dev
diff --git a/ci/run.sh b/ci/run.sh
index 5276c2d9d..4e1297de7 100755
--- a/ci/run.sh
+++ b/ci/run.sh
@@ -7,14 +7,10 @@ cargo test --target $TARGET --no-run
 cargo test --target $TARGET --no-run --features static-curl
 # Then with rustls TLS backend.
 #
-# Note: Cross-compiling rustls on windows doesn't work due to requiring some
-# NASM build stuff in aws_lc_rs, which may soon be fixed by
-# https://github.com/aws/aws-lc-rs/pull/528.
-#
 # Compiling on i686-windows requires nasm to be installed (other platforms
 # have pre-compiled object files), which is just slightly too much
 # inconvenience for me.
-if [ "$TARGET" != "x86_64-pc-windows-gnu" ] && [ "$TARGET" != "i686-pc-windows-msvc" ]
+if [ "$TARGET" != "i686-pc-windows-msvc" ]
 then
     cargo test --target $TARGET --no-run --features rustls,static-curl
 fi