diff --git a/appveyor.yml b/appveyor.yml
new file mode 100644
index 0000000..2aab676
--- /dev/null
+++ b/appveyor.yml
@@ -0,0 +1,34 @@
+version: "{build}"
+
+branches:
+  except:
+    - gh-pages
+    - traits
+
+skip_tags : true
+shallow_clone: true
+
+os: Visual Studio 2015 RC
+
+environment:
+  matrix:
+    - title: vc2015
+      compiler: Visual Studio 14 2015
+    - title: vc2013
+      compiler: Visual Studio 12 2013
+    - title: vc2012
+      compiler: Visual Studio 11 2012
+    - title: vc2010
+      compiler: Visual Studio 10 2010
+
+install:
+  - choco -y install cyg-get
+  - cyg-get make
+  - git clone --depth 1 https://github.com/CxxTest/cxxtest.git
+
+build_script:
+  - set CL=/I C:\projects\better-enums\cxxtest
+  - set PATH=%PATH%;C:\projects\better-enums\cxxtest\bin;C:\tools\cygwin\bin
+  - set PATH=C:\Program Files (x86)\MSBuild\14.0\Bin;%PATH%
+  - cd test
+  - make TITLE=%title% COMPILER="%compiler%" ms
diff --git a/doc/CompilerSupport.md b/doc/CompilerSupport.md
index 4cc8d4e..8f99dba 100644
--- a/doc/CompilerSupport.md
+++ b/doc/CompilerSupport.md
@@ -75,6 +75,8 @@ vc2015 /EHsc
 vc2015 /EHsc /DBETTER_ENUMS_STRICT_CONVERSION
 vc2013 /EHsc
 vc2013 /EHsc /DBETTER_ENUMS_STRICT_CONVERSION
+vc2012 /EHsc
+vc2010 /EHsc
 clang++36 -std=c++11
 clang++36 -std=c++11 -DBETTER_ENUMS_STRICT_CONVERSION
 clang++36 -std=c++11 -DBETTER_ENUMS_CONSTEXPR_TO_STRING
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index fa08fe9..229bb83 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -72,7 +72,7 @@ endif()
 # Basic tests.
 
 add_executable(cxxtest cxxtest/tests.cc)
-add_executable(link link/helper.cc link/main.cc)
+add_executable(linking linking/helper.cc linking/main.cc)
 
 set(PERFORMANCE_TESTS
     1-simple 2-include_empty 3-only_include_enum 4-declare_enums 5-iostream)
diff --git a/test/Makefile b/test/Makefile
index 65c2ded..62481bc 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -21,6 +21,7 @@ define PATH_FIX
 @true
 endef
 SUFFIX :=
+CXXTESTGEN := cxxtestgen
 
 else
 
@@ -30,6 +31,7 @@ define PATH_FIX
 sed 's!include "/!include "C:/cygwin/!g' $1 > $$$$ && mv $$$$ $1
 endef
 SUFFIX := .exe
+CXXTESTGEN := python `which cxxtestgen | sed s!/cygdrive/c!c:/!`
 
 endif
 
@@ -149,7 +151,7 @@ all-ms :
 	make TITLE=vc2015 COMPILER="Visual Studio 14 2015" ms
 
 $(CXXTEST_GENERATED) : cxxtest/*.h
-	cxxtestgen --error-printer -o $@ $^
+	$(CXXTESTGEN) --error-printer -o $@ $^
 	$(call PATH_FIX,$@)
 
 .PHONY : clean
diff --git a/test/link/helper.cc b/test/linking/helper.cc
similarity index 100%
rename from test/link/helper.cc
rename to test/linking/helper.cc
diff --git a/test/link/helper.h b/test/linking/helper.h
similarity index 100%
rename from test/link/helper.h
rename to test/linking/helper.h
diff --git a/test/link/main.cc b/test/linking/main.cc
similarity index 100%
rename from test/link/main.cc
rename to test/linking/main.cc
diff --git a/test/link/shared.h b/test/linking/shared.h
similarity index 100%
rename from test/link/shared.h
rename to test/linking/shared.h