diff --git a/appveyor.yml b/appveyor.yml
index 8a72bb62e..c2cd018a1 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -15,9 +15,14 @@ environment:
   - variant: test_release
     compiler: msvc
     linkflags: '"/LIBPATH:C:\\OpenSSL-Win32\\lib"'
-  - variant: test_debug
-    compiler: gcc
-    linkflags: '"-LC:\\OpenSSL-Win32\\lib"'
+
+# mingw and boost.random don't like each other. Comment this back in once there
+# is support
+
+#  - variant: test_debug
+#    compiler: gcc
+#    linkflags: '"-LC:\\OpenSSL-Win32\\lib"'
+
 install:
 - set ROOT_DIRECTORY=%CD%
 - cd %ROOT_DIRECTORY%
@@ -42,4 +47,5 @@ cache:
 - C:\OpenSSL-Win32
 build_script:
 - cd %ROOT_DIRECTORY%\test
-- b2.exe -j2 %compiler% variant=%variant% link=shared linkflags=%linkflags% include="C:\\OpenSSL-Win32\\include" warnings=off --abbreviate-paths
+- b2.exe -j2 win-tests %compiler% variant=%variant% link=shared linkflags=%linkflags% include="C:\\OpenSSL-Win32\\include" warnings=off --abbreviate-paths
+
diff --git a/include/libtorrent/performance_counters.hpp b/include/libtorrent/performance_counters.hpp
index db589b91d..f1aa7df6a 100644
--- a/include/libtorrent/performance_counters.hpp
+++ b/include/libtorrent/performance_counters.hpp
@@ -393,7 +393,7 @@ namespace libtorrent
 			num_fenced_flush_hashed,
 			num_fenced_flush_storage,
 			num_fenced_trim_cache,
-			num_fenced_file_priority, 
+			num_fenced_file_priority,
 			num_fenced_load_torrent,
 			num_fenced_clear_piece,
 			num_fenced_tick_storage,
diff --git a/simulation/Jamfile b/simulation/Jamfile
index 4cdc1033d..c9b7cb432 100644
--- a/simulation/Jamfile
+++ b/simulation/Jamfile
@@ -21,7 +21,7 @@ project
 	<picker-debugging>on
 	;
 
-test-suite libtorrent-sims :
+alias libtorrent-sims :
 	[ run test_swarm.cpp ]
 	[ run test_utp.cpp ]
 	[ run test_dht.cpp ]
diff --git a/test/Jamfile b/test/Jamfile
index 8fff4dc83..a0b910084 100644
--- a/test/Jamfile
+++ b/test/Jamfile
@@ -144,6 +144,7 @@ test-suite libtorrent :
 		test_settings_pack.cpp
 		test_fence.cpp
 		test_dos_blocker.cpp
+		test_stat_cache.cpp
 		test_file_progress.cpp ]
 
 	[ run test_storage.cpp ]
@@ -151,7 +152,6 @@ test-suite libtorrent :
 	[ run test_read_piece.cpp ]
 
 	[ run test_file.cpp ]
-	[ run test_stat_cache.cpp ]
 	[ run test_fast_extension.cpp ]
 	[ run test_privacy.cpp ]
 	[ run test_recheck.cpp ]
@@ -185,8 +185,38 @@ test-suite libtorrent :
 	[ run test_swarm.cpp ]
 	[ run test_super_seeding.cpp ]
 
-# make these test more reliable
+# turn these tests into simulations
 #	[ run test_upnp.cpp ]
 #	[ run test_lsd.cpp ]
 	;
 
+# these are the tests run on appveyor, while the flapping ones are being
+# transitioned into simulations
+alias win-tests :
+	test_primitives
+	test_pe_crypto
+	test_utp
+	test_remap_files
+	test_auto_unchoke
+	test_torrent
+	test_http_connection
+	test_transfer
+	test_time_critical
+	test_metadata_extension
+	test_pex
+	test_priority
+	test_super_seeding
+	test_swarm
+	test_storage
+	test_session
+	test_read_piece
+	test_file
+	test_fast_extension
+	test_recheck
+	test_resume
+	test_tracker
+	test_checking
+	;
+
+explicit win-tests ;
+