diff --git a/build/tfs/continuous-build.yml b/build/tfs/continuous-build.yml
index 009250e7ac06ed5fe0b47f8330cb03341c9b9796..7e75b568edee4c825db70ab76764fadae7f848f4 100644
--- a/build/tfs/continuous-build.yml
+++ b/build/tfs/continuous-build.yml
@@ -21,9 +21,6 @@ phases:
       .\scripts\test-integration.bat
       yarn smoketest
     name: test
-  - task: PublishTestResults@2
-    inputs:
-      testResultsFiles: '.build\tests\unit-test-results.xml'
 
 - phase: Linux
   queue: Hosted Linux Preview
@@ -56,9 +53,6 @@ phases:
       DISPLAY=:10 ./scripts/test.sh --tfs
       # DISPLAY=:10 ./scripts/test-integration.sh
     name: test
-  - task: PublishTestResults@2
-    inputs:
-      testResultsFiles: '.build/tests/unit-test-results.xml'
 
 - phase: macOS
   queue: Hosted macOS Preview
@@ -83,6 +77,3 @@ phases:
       ./scripts/test-integration.sh
       yarn smoketest
     name: test
-  - task: PublishTestResults@2
-    inputs:
-      testResultsFiles: '.build/tests/unit-test-results.xml'
diff --git a/build/tfs/product-build.yml b/build/tfs/product-build.yml
index 3b67df7dcf41fced8cec6b7c73a04dc2a69fca36..2727f5eed1c5417da2509c0a039066c0a41005c6 100644
--- a/build/tfs/product-build.yml
+++ b/build/tfs/product-build.yml
@@ -29,6 +29,7 @@ phases:
       $env:VSCODE_MIXIN_PASSWORD="$(VSCODE_MIXIN_PASSWORD)"
       npm run gulp -- mixin
       node build/tfs/common/installDistro.js
+      node build/lib/builtInExtensions.js
 
   - powershell: |
       $env:VSCODE_MIXIN_PASSWORD="$(VSCODE_MIXIN_PASSWORD)"
@@ -39,6 +40,7 @@ phases:
   - powershell: |
       npm run gulp -- "electron-$(VSCODE_ARCH)"
       .\scripts\test.bat --build --tfs
+      yarn smoketest -- --build "$(agent.builddirectory)/VSCode-win32-$(VSCODE_ARCH)"
     name: test
 
   - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
@@ -253,6 +255,7 @@ phases:
       npm run monaco-compile-check
       VSCODE_MIXIN_PASSWORD="$(VSCODE_MIXIN_PASSWORD)" npm run gulp -- mixin
       node build/tfs/common/installDistro.js
+      node build/lib/builtInExtensions.js
 
   - script: |
       VSCODE_MIXIN_PASSWORD="$(VSCODE_MIXIN_PASSWORD)" npm run gulp -- vscode-linux-$(VSCODE_ARCH)-min
@@ -261,6 +264,7 @@ phases:
   - script: |
       npm run gulp -- "electron-$(VSCODE_ARCH)"
       DISPLAY=:10 ./scripts/test.sh --build --tfs
+      # yarn smoketest -- --build "$(agent.builddirectory)/VSCode-linux-$(VSCODE_ARCH)"
     name: test
 
   - script: |
@@ -303,6 +307,7 @@ phases:
       npm run monaco-compile-check
       VSCODE_MIXIN_PASSWORD="$(VSCODE_MIXIN_PASSWORD)" npm run gulp -- mixin
       node build/tfs/common/installDistro.js
+      node build/lib/builtInExtensions.js
 
   - script: |
       VSCODE_MIXIN_PASSWORD="$(VSCODE_MIXIN_PASSWORD)" npm run gulp -- vscode-linux-$(VSCODE_ARCH)-min
@@ -311,6 +316,7 @@ phases:
   - script: |
       npm run gulp -- "electron-$(VSCODE_ARCH)"
       DISPLAY=:10 ./scripts/test.sh --build --tfs
+      # yarn smoketest -- --build "$(agent.builddirectory)/VSCode-linux-$(VSCODE_ARCH)"
     name: test
 
   - script: |
@@ -345,6 +351,7 @@ phases:
       npm run monaco-compile-check
       VSCODE_MIXIN_PASSWORD="$(VSCODE_MIXIN_PASSWORD)" npm run gulp -- mixin
       node build/tfs/common/installDistro.js
+      node build/lib/builtInExtensions.js
 
   - script: |
       VSCODE_MIXIN_PASSWORD="$(VSCODE_MIXIN_PASSWORD)" \
@@ -354,6 +361,8 @@ phases:
 
   - script: |
       ./scripts/test.sh --build --tfs
+      APP_NAME="`ls $(agent.builddirectory)/VSCode-darwin | head -n 1`"
+      yarn smoketest -- --build "$(agent.builddirectory)/VSCode-darwin/$APP_NAME"
     name: test
 
   - script: |
diff --git a/package.json b/package.json
index 1e15784e1b8e2cca9bbe1a078fbbbf1cad4a479a..5714b70e29c18ece044a3e20c34566dfe597092b 100644
--- a/package.json
+++ b/package.json
@@ -102,7 +102,6 @@
     "minimatch": "^2.0.10",
     "mkdirp": "^0.5.0",
     "mocha": "^2.2.5",
-    "mocha-junit-reporter": "^1.17.0",
     "object-assign": "^4.0.1",
     "optimist": "0.3.5",
     "p-all": "^1.0.0",
diff --git a/test/electron/index.js b/test/electron/index.js
index 770bb853d4cbdeecd1b9208f4dabdfd7081ba577..ee98b8f8ea30db820ca1819d196ac833c34036fb 100644
--- a/test/electron/index.js
+++ b/test/electron/index.js
@@ -8,7 +8,6 @@ const { tmpdir } = require('os');
 const { join } = require('path');
 const path = require('path');
 const mocha = require('mocha');
-const JUnitReporter = require('mocha-junit-reporter');
 const events = require('events');
 
 const defaultReporterName = process.platform === 'win32' ? 'list' : 'spec';
@@ -143,11 +142,6 @@ app.on('ready', () => {
 
 	if (argv.tfs) {
 		new TFSReporter(runner);
-		new JUnitReporter(runner, {
-			reporterOptions: {
-				mochaFile: '.build/tests/unit-test-results.xml'
-			}
-		});
 	} else {
 		const reporterPath = path.join(path.dirname(require.resolve('mocha')), 'lib', 'reporters', argv.reporter);
 		let Reporter;
diff --git a/yarn.lock b/yarn.lock
index 38c1ea2a301dfdb34f59231ac95489b9b24be4ce..139077c5c6b383f6717506b6dcd496afee671554 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -602,10 +602,6 @@ chalk@^2.3.0:
     escape-string-regexp "^1.0.5"
     supports-color "^4.0.0"
 
-charenc@~0.0.1:
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/charenc/-/charenc-0.0.2.tgz#c0a1d2f3a7092e03774bfa83f14c0fc5790a8667"
-
 cheerio@^1.0.0-rc.1:
   version "1.0.0-rc.2"
   resolved "https://registry.yarnpkg.com/cheerio/-/cheerio-1.0.0-rc.2.tgz#4b9f53a81b27e4d5dac31c0ffd0cfa03cc6830db"
@@ -885,10 +881,6 @@ cross-spawn@^5.0.1:
     shebang-command "^1.2.0"
     which "^1.2.9"
 
-crypt@~0.0.1:
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/crypt/-/crypt-0.0.2.tgz#88d7ff7ec0dfb86f713dc87bbb42d044d3e6c41b"
-
 cryptiles@0.2.x:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-0.2.2.tgz#ed91ff1f17ad13d3748288594f8a48a0d26f325c"
@@ -2753,10 +2745,6 @@ is-buffer@^1.0.2:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.4.tgz#cfc86ccd5dc5a52fa80489111c6920c457e2d98b"
 
-is-buffer@~1.1.1:
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
-
 is-builtin-module@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-builtin-module/-/is-builtin-module-1.0.0.tgz#540572d34f7ac3119f8f76c30cbc1b1e037affbe"
@@ -3510,14 +3498,6 @@ math-expression-evaluator@^1.2.14:
   version "1.2.17"
   resolved "https://registry.yarnpkg.com/math-expression-evaluator/-/math-expression-evaluator-1.2.17.tgz#de819fdbcd84dccd8fae59c6aeb79615b9d266ac"
 
-md5@^2.1.0:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/md5/-/md5-2.2.1.tgz#53ab38d5fe3c8891ba465329ea23fac0540126f9"
-  dependencies:
-    charenc "~0.0.1"
-    crypt "~0.0.1"
-    is-buffer "~1.1.1"
-
 mdurl@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/mdurl/-/mdurl-1.0.1.tgz#fe85b2ec75a59037f2adfec100fd6c601761152e"
@@ -3671,16 +3651,6 @@ mksnapshot@^0.3.0:
     fs-extra "0.26.7"
     request "^2.79.0"
 
-mocha-junit-reporter@^1.17.0:
-  version "1.17.0"
-  resolved "https://registry.yarnpkg.com/mocha-junit-reporter/-/mocha-junit-reporter-1.17.0.tgz#2e5149ed40fc5d2e3ca71e42db5ab1fec9c6d85c"
-  dependencies:
-    debug "^2.2.0"
-    md5 "^2.1.0"
-    mkdirp "~0.5.1"
-    strip-ansi "^4.0.0"
-    xml "^1.0.0"
-
 mocha@^2.0.1, mocha@^2.2.5:
   version "2.5.3"
   resolved "https://registry.yarnpkg.com/mocha/-/mocha-2.5.3.tgz#161be5bdeb496771eb9b35745050b622b5aefc58"
@@ -6029,10 +5999,6 @@ xml2js@^0.4.19:
     sax ">=0.6.0"
     xmlbuilder "~9.0.1"
 
-xml@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/xml/-/xml-1.0.1.tgz#78ba72020029c5bc87b8a81a3cfcd74b4a2fc1e5"
-
 xmlbuilder@0.4.3:
   version "0.4.3"
   resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-0.4.3.tgz#c4614ba74e0ad196e609c9272cd9e1ddb28a8a58"