diff --git a/.travis.yml b/.travis.yml
index 14bc1c3..44ce3dc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -39,7 +39,9 @@ matrix:
         - sudo apt-get install -y libz-dev valgrind
           gcc-mingw-w64-x86-64 libz-mingw-w64-dev
       script:
-        - scripts/run_tests.sh gzip windows
+        - scripts/run_tests.sh gzip
+        - make CC=i686-w64-mingw32-gcc CFLAGS=-Werror all test_programs
+        - make CC=x86_64-w64-mingw32-gcc CFLAGS=-Werror all test_programs
 
     - name: Basic tests (old Linux distro, gcc)
       os: linux
diff --git a/scripts/run_tests.sh b/scripts/run_tests.sh
index 17775ce..fcdc216 100755
--- a/scripts/run_tests.sh
+++ b/scripts/run_tests.sh
@@ -209,25 +209,6 @@ freestanding_tests() {
 
 ###############################################################################
 
-windows_tests() {
-	local arch
-
-	test_group_included windows || return 0
-
-	# Windows: currently compiled but not run
-	for arch in i686 x86_64; do
-		local compiler=${arch}-w64-mingw32-gcc
-		if ! type -P $compiler > /dev/null; then
-			log_skip "$compiler not found"
-			continue
-		fi
-		run_cmd make CC=$compiler CFLAGS=-Werror -j$NPROC \
-			all test_programs
-	done
-}
-
-###############################################################################
-
 gzip_tests() {
 	test_group_included gzip || return 0
 
@@ -264,7 +245,6 @@ log "	TESTDATA=$TESTDATA"
 
 native_tests
 freestanding_tests
-windows_tests
 gzip_tests
 
 if (( TESTS_SKIPPED )); then