diff --git a/.travis.yml b/.travis.yml
index f97c863b07a..a87e423d8aa 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,7 +10,7 @@ before_install:
   - nvm install 4.6.0
   - export PATH=/usr/local/phantomjs-2.0.0/bin:$PATH
   - npm config set spin false
-  - npm install -g yarnpkg
+  - npm install -g yarn
 
 install:
   - pip install 'travis-cargo<0.2' --user && export PATH=$HOME/.local/bin:$PATH
diff --git a/README.md b/README.md
index d5ea70b2820..8745e1a2c61 100644
--- a/README.md
+++ b/README.md
@@ -12,11 +12,9 @@ This project is built on ember-cli and cargo, visit
 ```bash
 git clone https://github.com/rust-lang/crates.io.git
 cd crates.io/
-npm install -g yarnpkg # if you don't have yarn
-yarn global add bower
-yarn global add ember-cli
+npm install -g yarn # if you don't have yarn
 yarn
-bower install
+yarn run bower install
 ```
 
 The website's frontend is built with [Ember.js](http://emberjs.com/). This 
@@ -54,8 +52,8 @@ phantomjs-prebuilt`.
 Then run the tests with:
 
 ```
-ember test
-ember test --server
+yarn run ember test
+yarn run ember test --server
 ```
 
 ## Working on the Backend