diff --git a/.travis.yml b/.travis.yml
index fb6dd87f9..4ceda80b3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,11 +11,11 @@ node_js:
 - '4'
 
 before_install:
-- curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 1.0.2
+- curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 1.3.2
 - export PATH=$HOME/.yarn/bin:$PATH
 
 before_script:
-- yarn run bootstrap && yarn run build
+- yarn build
 
 script:
 - if [ -n "${LINT-}" ]; then yarn run lint ; fi
diff --git a/appveyor.yml b/appveyor.yml
index fb817026f..cebb9a0d9 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -12,7 +12,7 @@ cache:
 
 install:
   - ps: Install-Product node $env:nodejs_version x64
-  - npm install -g yarn@1.0.2
+  - npm install -g yarn@1.3.2
   - set PATH=%APPDATA%\npm;%PATH%
   - yarn
 
diff --git a/circle.yml b/circle.yml
index 22259ab3b..aeb77bc4a 100644
--- a/circle.yml
+++ b/circle.yml
@@ -4,7 +4,7 @@ machine:
   node:
     version: "node"
   environment:
-    PATH: $PATH:./node_modules/.bin
+    PATH: "${PATH}:${HOME}/${CIRCLE_PROJECT_REPONAME}/node_modules/.bin:./node_modules/.bin"
 
 checkout:
   post:
@@ -14,8 +14,10 @@ checkout:
 dependencies:
   override:
     - yarn
+  cache_directories:
+    - ~/.cache/yarn
   post:
-    - yarn run bootstrap && yarn run build
+    - yarn build
 
 test:
   override: