diff --git a/tests/test.cpp b/tests/test.cpp
index 4b5f492fa4..e8628ac591 100644
--- a/tests/test.cpp
+++ b/tests/test.cpp
@@ -350,9 +350,12 @@ extern bool IsAutomaticTest()
         s_isAutomatic = username == "buildbot" ||
                             username.Matches("sandbox*");
 
-        // Also recognize Travis CI environment.
+        // Also recognize Travis and AppVeyor CI environments.
         if ( !s_isAutomatic )
-            s_isAutomatic = wxGetEnv("TRAVIS", NULL);
+        {
+            s_isAutomatic = wxGetEnv("TRAVIS", NULL) ||
+                                wxGetEnv("APPVEYOR", NULL);
+        }
     }
 
     return s_isAutomatic == 1;