diff --git a/circle.yml b/circle.yml
index 32c6ef9..847dd1d 100644
--- a/circle.yml
+++ b/circle.yml
@@ -13,6 +13,7 @@ dependencies:
     - docker pull thewtex/cross-compiler-linux-ppc64le
     - docker pull thewtex/cross-compiler-linux-x64
     - docker pull thewtex/cross-compiler-linux-x86
+    - docker pull thewtex/cross-compiler-windows-x64
 
 test:
   override:
@@ -32,6 +33,9 @@ test:
     - docker run --rm -v ~/cross-compilers/test/:/usr/src/test:ro thewtex/cross-compiler-linux-x64 python /usr/src/test/run.py
     - make linux-x86
     - docker run --rm -v ~/cross-compilers/test/:/usr/src/test:ro thewtex/cross-compiler-linux-x86 python /usr/src/test/run.py
+    - make windows-x64:
+        timeout: 3000
+    - docker run --rm -v ~/cross-compilers/test/:/usr/src/test:ro thewtex/cross-compiler-windows-x64 python /usr/src/test/run.py --emulator /usr/bin/wine --exe-suffix ".exe"
 
 deployment:
   hub:
@@ -46,3 +50,4 @@ deployment:
       - docker push thewtex/cross-compiler-linux-ppc64le
       - docker push thewtex/cross-compiler-linux-x64
       - docker push thewtex/cross-compiler-linux-x86
+      - docker push thewtex/cross-compiler-windows-x64
diff --git a/test/run.py b/test/run.py
index 5bbe200..29069ec 100755
--- a/test/run.py
+++ b/test/run.py
@@ -14,7 +14,7 @@ import subprocess
 import sys
 import tempfile
 
-def test_none_build_system(build_dir, language, source, linker_flags):
+def test_none_build_system(build_dir, language, source, linker_flags, exe_suffix):
     build_cmd = list()
     if language == 'C':
         compiler = os.getenv('CC', 'cc')
@@ -28,6 +28,9 @@ def test_none_build_system(build_dir, language, source, linker_flags):
         build_cmd.extend(linker_flags)
     build_cmd.append(source)
 
+    build_cmd.append('-o')
+    build_cmd.append('a.out' + exe_suffix)
+
     print('Building ' + source + ' by calling ' + compiler + '...')
     print(' '.join(build_cmd))
     sys.stdout.flush()
@@ -80,7 +83,8 @@ def test_source(source, language, build_system, emulator, linker_flags,
     os.chdir(build_dir)
 
     if build_system == 'None':
-        result += test_none_build_system(build_dir, language, source, linker_flags)
+        result += test_none_build_system(build_dir, language, source,
+                linker_flags, exe_suffix)
     elif build_system == 'CMake':
         result += test_cmake_build_system(build_dir, language, source, emulator,
                 linker_flags, exe_suffix)