diff --git a/.appveyor.yml b/.appveyor.yml
index 2819e052120..4efa9159584 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -1,15 +1,14 @@
 environment:
   matrix:
     # Unit and integration tests.
-    - PYTHON: "C:\\Python27"
+    - PYTHON: "C:\\Python27-x64"
+      RUN_INTEGRATION_TESTS: "True"
+    - PYTHON: "C:\\Python35-x64"
       RUN_INTEGRATION_TESTS: "True"
     - PYTHON: "C:\\Python36-x64"
       RUN_INTEGRATION_TESTS: "True"
     # Unit tests only.
-    - PYTHON: "C:\\Python27-x64"
-    - PYTHON: "C:\\Python35"
-    - PYTHON: "C:\\Python35-x64"
-    - PYTHON: "C:\\Python36"
+    # Nothing for the moment
 
 matrix:
     fast_finish: true
diff --git a/.azure-pipelines/jobs/test-windows.yml b/.azure-pipelines/jobs/test-windows.yml
index 752646247d0..ee869c87c89 100644
--- a/.azure-pipelines/jobs/test-windows.yml
+++ b/.azure-pipelines/jobs/test-windows.yml
@@ -9,11 +9,11 @@ jobs:
     vmImage: ${{ parameters.vmImage }}
   strategy:
     matrix:
-      Python27-x64:
+      Python27-x86:
         python.version: '2.7'
-        python.architecture: x64
-      Python36-x64:
-        python.version: '3.6'
+        python.architecture: x86
+      Python37-x64:
+        python.version: '3.7'
         python.architecture: x64
     maxParallel: 2
 
@@ -32,16 +32,7 @@ jobs:
     vmImage: ${{ parameters.vmImage }}
   strategy:
     matrix:
-      Python35-x64:
-        python.version: '3.5'
-        python.architecture: x64
-      Python37-x64:
-        python.version: '3.7'
-        python.architecture: x64
       # This is for Windows, so test x86 builds
-      Python27-x86:
-        python.version: '2.7'
-        python.architecture: x86
       Python35-x86:
         python.version: '3.5'
         python.architecture: x86