diff --git a/.circleci/config.yml b/.circleci/config.yml
index 22bf8f29dde2e..fcd874a916324 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -287,7 +287,7 @@ step-mksnapshot-store: &step-mksnapshot-store
     path: src/out/Default/mksnapshot.zip
     destination: mksnapshot.zip
 
-step-generate-breakpad_symbols: &step-generate-breakpad_symbols
+step-generate-breakpad-symbols: &step-generate-breakpad-symbols
   run:
     name: Generate breakpad symbols
     command: |
@@ -295,6 +295,9 @@ step-generate-breakpad_symbols: &step-generate-breakpad_symbols
       # Build needed dump_syms executable
       ninja -C out/Default third_party/breakpad:dump_syms
       electron/script/dump-symbols.py -d "$PWD/out/Default/electron.breakpad.syms"
+
+      # TODO(alexeykuzmin): Explicitly pass an out folder path to the "zip-symbols.py" script.
+      export ELECTRON_OUT_DIR=Default
       electron/script/zip-symbols.py
 
 step-maybe-native-mksnapshot-gn-gen: &step-maybe-native-mksnapshot-gn-gen
@@ -415,6 +418,10 @@ steps-electron-build-for-tests: &steps-electron-build-for-tests
     # Save all data needed for a further tests run.
     - *step-persist-data-for-tests
 
+    # Breakpad symbols.
+    # TODO(alexeykuzmin): We should do it only in nightly builds.
+    - *step-generate-breakpad-symbols
+
     # Trigger tests on arm hardware if needed
     - *step-maybe-trigger-arm-test
 
@@ -433,7 +440,7 @@ steps-electron-build-for-publish: &steps-electron-build-for-publish
     - *step-electron-build
     - *step-electron-dist-build
     - *step-electron-dist-store
-    - *step-generate-breakpad_symbols
+    - *step-generate-breakpad-symbols
 
     # mksnapshot
     - *step-mksnapshot-build
diff --git a/vsts.yml b/vsts.yml
index 063897a0502f0..e1de021b27bb6 100644
--- a/vsts.yml
+++ b/vsts.yml
@@ -72,6 +72,9 @@ jobs:
       # Build needed dump_syms executable
       ninja -C out/Default third_party/breakpad:dump_syms
       electron/script/dump-symbols.py -d "$PWD/out/Default/electron.breakpad.syms"
+
+      # TODO(alexeykuzmin): Explicitly pass an out folder path to the "zip-symbols.py" script.
+      export ELECTRON_OUT_DIR=Default
       electron/script/zip-symbols.py
     displayName: Ninja build app
     condition: and(succeeded(), eq(variables['ELECTRON_RELEASE'], '1'))