diff --git a/build/vsts-ci.yml b/build/vsts-ci.yml
index 596e48d2..e63127fe 100644
--- a/build/vsts-ci.yml
+++ b/build/vsts-ci.yml
@@ -1,28 +1,28 @@
 phases:
-- template: signed_build_phase.yml
-  parameters:
-    name: Build_windows_RlsWinPy3_7
-    config: RlsWinPy3.7
-- template: signed_build_phase.yml
-  parameters:
-    name: Build_windows_RlsWinPy3_6
-    config: RlsWinPy3.6
-- template: signed_build_phase.yml
-  parameters:
-    name: Build_windows_RlsWinPy3_5
-    config: RlsWinPy3.5
-- template: signed_build_phase.yml
+
+# Build all configurations for Windows
+- template: /build/ci/phase-template.yml
   parameters:
-    name: Build_windows_RlsWinPy2_7
-    config: RlsWinPy2.7
+    name: Windows
+    buildScript: build.cmd
+    buildMatrix:
+      Py37:
+        _configuration: RlsWinPy3.7
+      Py36:
+        _configuration: RlsWinPy3.6
+      Py35:
+        _configuration: RlsWinPy3.5
+      Py27:
+        _configuration: RlsWinPy2.7
+    buildQueue:
+      name: Hosted VS2017
+    testOptions: --includeExtendedTests
 
-# Build all configurations for Linux
-  # Run tests on Ubuntu16
+# Build all configurations for Mac
 - template: /build/ci/phase-template.yml
   parameters:
     name: Mac
     buildScript: ./build.sh
-    testDistro: noTests
     buildMatrix:
       Py37:
         _configuration: RlsMacPy3.7
@@ -34,11 +34,53 @@ phases:
         _configuration: RlsMacPy2.7
     buildQueue:
       name: Hosted macOS
+    testOptions: --includeExtendedTests
+
+# Build all configurations for Linux
+  # Run tests on Ubuntu16
 - template: /build/ci/phase-template.yml
   parameters:
     name: Linux_Ubuntu16
     buildScript: ./build.sh
-    testDistro: noTests
+    testDistro: ubuntu16
+    buildMatrix:
+      Py37:
+        _configuration: RlsLinPy3.7
+      Py36:
+        _configuration: RlsLinPy3.6
+      Py35:
+        _configuration: RlsLinPy3.5
+      Py27:
+        _configuration: RlsLinPy2.7
+    buildQueue:
+      name: Hosted Ubuntu 1604
+    testOptions: --includeExtendedTests
+
+  # Run tests on Ubuntu14
+- template: /build/ci/phase-template.yml
+  parameters:
+    name: Linux_Ubuntu14
+    buildScript: ./build.sh
+    testDistro: ubuntu14
+    buildMatrix:
+      Py37:
+        _configuration: RlsLinPy3.7
+      Py36:
+        _configuration: RlsLinPy3.6
+      Py35:
+        _configuration: RlsLinPy3.5
+      Py27:
+        _configuration: RlsLinPy2.7
+    buildQueue:
+      name: Hosted Ubuntu 1604
+    testOptions: --includeExtendedTests
+
+  # Run tests on CentOS7
+- template: /build/ci/phase-template.yml
+  parameters:
+    name: Linux_CentOS7
+    buildScript: ./build.sh
+    testDistro: centos7
     buildMatrix:
       Py37:
         _configuration: RlsLinPy3.7
@@ -49,4 +91,5 @@ phases:
       Py27:
         _configuration: RlsLinPy2.7
     buildQueue:
-      name: Hosted Ubuntu 1604
\ No newline at end of file
+      name: Hosted Ubuntu 1604
+    testOptions: --includeExtendedTests