diff --git a/build/ci/templates/jobs/smoke.yml b/build/ci/templates/jobs/smoke.yml
index 2a8285dfd250..70ab40523489 100644
--- a/build/ci/templates/jobs/smoke.yml
+++ b/build/ci/templates/jobs/smoke.yml
@@ -3,8 +3,9 @@ jobs:
   parameters:
     # In PRs, test only against stable version of VSC.
     vscodeChannels: ['stable']
-    # In PRs, run smoke tests against 3.7 and 2.7 (excluding others).
+    # In PRs, run smoke tests against 3.7 (excluding others).
+    # Azure seems to hang very often when running tests against 2.7
     jobs:
     - test: "Smoke"
       tags: "@smoke"
-      ignorePythonVersions: "3.6,3.5"
+      ignorePythonVersions: "2.7,3.6,3.5"
diff --git a/build/ci/vscode-python-ci.yaml b/build/ci/vscode-python-ci.yaml
index c081d8fe602f..f2939bf55565 100644
--- a/build/ci/vscode-python-ci.yaml
+++ b/build/ci/vscode-python-ci.yaml
@@ -20,11 +20,6 @@ stages:
   jobs:
   - template: templates/jobs/build_compile.yml
 
-- stage: Build_UITests
-  dependsOn: []
-  jobs:
-  - template: templates/jobs/build_uitests.yml
-
 - stage: Tests
   dependsOn: []
   jobs:
@@ -272,9 +267,33 @@ stages:
 - stage: Smoke
   dependsOn:
   - Build
-  - Build_UITests
   jobs:
-  - template: templates/jobs/smoke.yml
+  - job: 'Smoke'
+    dependsOn: []
+    strategy:
+      matrix:
+        'Mac-Py3.7':
+            PythonVersion: '3.7'
+            VMImageName: 'macos-10.13'
+            TestsToRun: 'testSmoke'
+            NeedsPythonTestReqs: true
+        'Linux-Py3.7':
+            PythonVersion: '3.7'
+            VMImageName: 'ubuntu-16.04'
+            TestsToRun: 'testSmoke'
+            NeedsPythonTestReqs: true
+        'Win-Py3.7':
+            PythonVersion: '3.7'
+            VMImageName: 'vs2017-win2016'
+            TestsToRun: 'testSmoke'
+            NeedsPythonTestReqs: true
+
+    pool:
+      vmImage: $(VMImageName)
+
+    steps:
+      - template: templates/test_phases.yml
+
 
 - stage: Reports
   dependsOn:
@@ -282,5 +301,4 @@ stages:
   - Tests
   condition: always()
   jobs:
-  - template: templates/jobs/merge_upload_uitest_report.yml
   - template: templates/jobs/coverage.yml
diff --git a/build/ci/vscode-python-nightly-ci.yaml b/build/ci/vscode-python-nightly-ci.yaml
index e1f3d7b1e19d..a1752c80cfb0 100644
--- a/build/ci/vscode-python-nightly-ci.yaml
+++ b/build/ci/vscode-python-nightly-ci.yaml
@@ -27,11 +27,6 @@ stages:
   jobs:
   - template: templates/jobs/build_compile.yml
 
-- stage: Build_UITests
-  dependsOn: []
-  jobs:
-  - template: templates/jobs/build_uitests.yml
-
 - stage: Tests
   dependsOn:
   - Build
@@ -438,12 +433,36 @@ stages:
     steps:
       - template: templates/test_phases.yml
 
+
 - stage: Smoke
   dependsOn:
   - Build
-  - Build_UITests
   jobs:
-  - template: templates/jobs/smoke.yml
+  - job: 'Smoke'
+    dependsOn: []
+    strategy:
+      matrix:
+        'Mac-Py3.7':
+            PythonVersion: '3.7'
+            VMImageName: 'macos-10.13'
+            TestsToRun: 'testSmoke'
+            NeedsPythonTestReqs: true
+        'Linux-Py3.7':
+            PythonVersion: '3.7'
+            VMImageName: 'ubuntu-16.04'
+            TestsToRun: 'testSmoke'
+            NeedsPythonTestReqs: true
+        'Win-Py3.7':
+            PythonVersion: '3.7'
+            VMImageName: 'vs2017-win2016'
+            TestsToRun: 'testSmoke'
+            NeedsPythonTestReqs: true
+
+    pool:
+      vmImage: $(VMImageName)
+
+    steps:
+      - template: templates/test_phases.yml
 
 - stage: Reports
   dependsOn:
@@ -451,5 +470,4 @@ stages:
   - Tests
   condition: always()
   jobs:
-  - template: templates/jobs/merge_upload_uitest_report.yml
   - template: templates/jobs/coverage.yml
diff --git a/build/ci/vscode-python-pr-validation.yaml b/build/ci/vscode-python-pr-validation.yaml
index ba9ed2289489..a5a25a53beb2 100644
--- a/build/ci/vscode-python-pr-validation.yaml
+++ b/build/ci/vscode-python-pr-validation.yaml
@@ -22,11 +22,6 @@ stages:
   jobs:
   - template: templates/jobs/build_compile.yml
 
-- stage: Build_UITests
-  dependsOn: []
-  jobs:
-  - template: templates/jobs/build_uitests.yml
-
 - stage: Tests
   dependsOn: []
   jobs:
@@ -100,9 +95,32 @@ stages:
 - stage: Smoke
   dependsOn:
   - Build
-  - Build_UITests
   jobs:
-  - template: templates/jobs/smoke.yml
+  - job: 'Smoke'
+    dependsOn: []
+    strategy:
+      matrix:
+        'Mac-Py3.7':
+            PythonVersion: '3.7'
+            VMImageName: 'macos-10.13'
+            TestsToRun: 'testSmoke'
+            NeedsPythonTestReqs: true
+        'Linux-Py3.7':
+            PythonVersion: '3.7'
+            VMImageName: 'ubuntu-16.04'
+            TestsToRun: 'testSmoke'
+            NeedsPythonTestReqs: true
+        'Win-Py3.7':
+            PythonVersion: '3.7'
+            VMImageName: 'vs2017-win2016'
+            TestsToRun: 'testSmoke'
+            NeedsPythonTestReqs: true
+
+    pool:
+      vmImage: $(VMImageName)
+
+    steps:
+      - template: templates/test_phases.yml
 
 - stage: Reports
   dependsOn:
@@ -110,5 +128,4 @@ stages:
   - Tests
   condition: always()
   jobs:
-  - template: templates/jobs/merge_upload_uitest_report.yml
   - template: templates/jobs/coverage.yml