diff --git a/test/runner/lib/core_ci.py b/test/runner/lib/core_ci.py
index 6ab6568fef1..29ba6bb5106 100644
--- a/test/runner/lib/core_ci.py
+++ b/test/runner/lib/core_ci.py
@@ -73,6 +73,9 @@ class AnsibleCoreCI(object):
             azure=(
                 'azure',
                 'rhel',
+                'windows/2012',
+                'windows/2012-R2',
+                'windows/2016',
             ),
             parallels=(
                 'osx',
@@ -88,6 +91,11 @@ class AnsibleCoreCI(object):
                     # assign default provider based on platform
                     self.provider = candidate
                     break
+            for candidate in providers:
+                if '%s/%s' % (platform, version) in providers[candidate]:
+                    # assign default provider based on platform and version
+                    self.provider = candidate
+                    break
 
         if self.provider in ('aws', 'azure'):
             if self.provider != 'aws':