diff --git a/.travis.yml b/.travis.yml
index b7a6d43ba21..8b51253261c 100755
--- a/.travis.yml
+++ b/.travis.yml
@@ -38,7 +38,7 @@ install:
 
 script:
 - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then npm run test ; fi
-- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker run --rm -v ${PWD}:/project -v ~/.electron:/root/.electron electronuserland/electron-builder:wine /test.sh ; fi
+- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker run --rm -e CI -e TRAVIS -v ${PWD}:/project -v ~/.electron:/root/.electron electronuserland/electron-builder:wine /test.sh ; fi
 
 after_success:
 - node out/cleanup.js
diff --git a/circle.yml b/circle.yml
index 12b74925791..3282187d405 100644
--- a/circle.yml
+++ b/circle.yml
@@ -14,7 +14,7 @@ dependencies:
     - sudo apt-get install git-lfs=1.2.0
     - ssh git@github.com git-lfs-authenticate $CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME.git download
     - git lfs pull
-    - docker run --rm -v ${PWD}:/project -v ~/.electron:/root/.electron -v ~/.cache:/root/.cache electronuserland/electron-builder:wine /test.sh
+    - docker run --rm -e CI -e TRAVIS -v ${PWD}:/project -v ~/.electron:/root/.electron -v ~/.cache:/root/.cache electronuserland/electron-builder:wine /test.sh
 
 test:
   override:
diff --git a/src/builder.ts b/src/builder.ts
index f81b6acba78..ef415881993 100644
--- a/src/builder.ts
+++ b/src/builder.ts
@@ -192,7 +192,7 @@ export async function build(rawOptions?: CliOptions): Promise<void> {
         options.publish = "onTag"
         isPublishOptionGuessed = true
       }
-      else if ((process.env.TRAVIS || process.env.APPVEYOR || process.env.CIRCLECI || "").toLowerCase() === "true") {
+      else if ((process.env.CI || "").toLowerCase() === "true") {
         log("CI detected, so artifacts will be published if draft release exists")
         options.publish = "onTagOrDraft"
         isPublishOptionGuessed = true
diff --git a/test/src/helpers/avaEx.ts b/test/src/helpers/avaEx.ts
index e5caa3b3166..8fa7aa12508 100644
--- a/test/src/helpers/avaEx.ts
+++ b/test/src/helpers/avaEx.ts
@@ -45,17 +45,18 @@ Object.defineProperties(test, {
   },
   "ifDevOrWinCi": {
     get: function () {
-      return !process.env.CI || process.platform === "win32" ? this : this.skip
+      console.log(process.env)
+      return process.env.CI == null || process.platform === "win32" ? this : this.skip
     }
   },
   "ifDevOrLinuxCi": {
     get: function () {
-      return !process.env.CI || process.platform === "linux" ? this : this.skip
+      return process.env.CI == null || process.platform === "linux" ? this : this.skip
     }
   },
   "ifWinCi": {
     get: function () {
-      return process.env.CI && process.platform === "win32" ? this : this.skip
+      return (process.env.CI || "").toLowerCase() === "true" && process.platform === "win32" ? this : this.skip
     }
   }
 })