diff --git a/.circleci/config.yml b/.circleci/config.yml
index f2565a8d252..960e705b101 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -140,6 +140,18 @@ step-electron-dist-store: &step-electron-dist-store
     path: src/out/Default/dist.zip
     destination: dist.zip
 
+step-electron-chromedriver-build: &step-electron-chromedriver-build
+  run:
+    name: Build chromedriver.zip
+    command: |
+      cd src
+      ninja -C out/Default electron:electron_chromedriver_zip
+
+step-electron-chromedriver-store: &step-electron-chromedriver-store
+  store_artifacts:
+    path: src/out/Default/chromedriver.zip
+    destination: chromedriver.zip
+
 step-nodejs-headers-build: &step-nodejs-headers-build
   run:
     name: Build Node.js headers
@@ -272,6 +284,10 @@ steps-electron-build-for-tests: &steps-electron-build-for-tests
     - *step-electron-dist-build
     - *step-electron-dist-store
 
+    # chromedriver
+    - *step-electron-chromedriver-build
+    - *step-electron-chromedriver-store
+
     # Node.js headers
     - *step-nodejs-headers-build
 
@@ -389,6 +405,10 @@ steps-build-mac: &steps-build-mac
     - *step-electron-dist-build
     - *step-electron-dist-store
 
+    # chromedriver
+    - *step-electron-chromedriver-build
+    - *step-electron-chromedriver-store
+
     # ffmpeg
     - *step-ffmpeg-gn-gen
     - *step-ffmpeg-build
diff --git a/BUILD.gn b/BUILD.gn
index a102e522d81..199b19cfb55 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -222,7 +222,6 @@ static_library("electron_lib") {
     "//base",
     "//base:i18n",
     "//chrome/common:constants",
-    "//chrome/test/chromedriver",
     "//components/network_session_configurator/common",
     "//components/prefs",
     "//components/printing/common",
@@ -498,10 +497,14 @@ if (is_mac) {
     ]
   }
 
-  if (is_component_ffmpeg) {
+  if (!is_component_build) {
     bundle_data("electron_framework_libraries") {
-      sources =  [ "$root_out_dir/libffmpeg.dylib" ]
-      public_deps = [ "//third_party/ffmpeg:ffmpeg" ]
+      sources = []
+      public_deps = []
+      if (is_component_ffmpeg) {
+        sources += [ "$root_out_dir/libffmpeg.dylib" ]
+        public_deps += [ "//third_party/ffmpeg:ffmpeg" ]
+      }
       outputs = [
         "{{bundle_contents_dir}}/Libraries/{{source_file_part}}",
       ]
@@ -903,6 +906,7 @@ dist_zip("electron_dist_zip") {
   ]
 }
 
+
 dist_zip("electron_ffmpeg_zip") {
   data_deps = [
     "//third_party/ffmpeg",
@@ -912,6 +916,16 @@ dist_zip("electron_ffmpeg_zip") {
   ]
 }
 
+dist_zip("electron_chromedriver_zip") {
+  data_deps = [
+    "//chrome/test/chromedriver",
+    ":licenses",
+  ]
+  outputs = [
+    "$root_build_dir/chromedriver.zip",
+  ]
+}
+
 group("electron") {
   deps = [
     ":electron_app",
diff --git a/appveyor.yml b/appveyor.yml
index 2fa527201ea..7488af3a69b 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -29,7 +29,9 @@ build_script:
   - gn gen out/ffmpeg "--args=import(\"//electron/build/args/ffmpeg.gn\") %GN_EXTRA_ARGS%"
   - ninja -C out/ffmpeg third_party/ffmpeg
   - ninja -C out/Default electron:electron_dist_zip
+  - ninja -C out/Default electron:electron_chromedriver_zip
   - appveyor PushArtifact out/Default/dist.zip
+  - appveyor PushArtifact out/Default/chromedriver.zip
 test_script:
   - if "%GN_CONFIG%"=="testing" ( echo Verifying non proprietary ffmpeg & python electron\script\verify-ffmpeg.py --build-dir out\Default --source-root %cd% --ffmpeg-path out\ffmpeg )
   - ps: >-
diff --git a/vsts.yml b/vsts.yml
index 6f16bf2b9b0..5d6b5ccf058 100644
--- a/vsts.yml
+++ b/vsts.yml
@@ -78,6 +78,11 @@ jobs:
       ninja -C out/Default electron:electron_dist_zip
     displayName: Build dist zip
 
+  - bash: |
+      cd src
+      ninja -C out/Default electron:electron_chromedriver_zip
+    displayName: Build chromedriver and zip
+
   - task: PublishTestResults@2
     displayName: Publish Test Results
     inputs:
@@ -89,7 +94,13 @@ jobs:
     displayName: Publish Build Artifacts
     inputs:
       PathtoPublish: '$(System.DefaultWorkingDirectory)/src/out/Default/dist.zip'
-      ArtifactName: dist.zip
+      ArtifactName: dist
+
+  - task: PublishBuildArtifacts@1
+    displayName: Publish Build Artifacts
+    inputs:
+      PathtoPublish: '$(System.DefaultWorkingDirectory)/src/out/Default/chromedriver.zip'
+      ArtifactName: dist
 
   - bash: |
       export BUILD_URL="${SYSTEM_TEAMFOUNDATIONCOLLECTIONURI}${SYSTEM_TEAMPROJECT}/_build/results?buildId=${BUILD_BUILDID}"