diff --git a/.travis.yml b/.travis.yml
index 59b284b81..084e35be9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,12 +1,21 @@
 sudo: required
-dist: trusty
 
 language: generic
 
+matrix:
+  include:
+    - os: linux
+      dist: trusty
+    - os: osx
+      osx_image: xcode7
+  allow_failures:
+    - os: osx
+      osx_image: xcode7
+
 before_install:
-  - sudo apt-get -y update
-  - sudo apt-get -y install git
-  - sudo add-apt-repository --yes ppa:kalakris/cmake
+  - if [[ $TRAVIS_OS_NAME == 'linux' ]]; then sudo apt-get -y update ; fi
+  - if [[ $TRAVIS_OS_NAME == 'linux' ]]; then sudo apt-get -y install git ; fi
+  - if [[ $TRAVIS_OS_NAME == 'linux' ]]; then sudo add-apt-repository --yes ppa:kalakris/cmake ; fi
 
 install:
   - bash setup.sh
diff --git a/README.md b/README.md
index d86a968c3..416acc71c 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,7 @@
 # Ray
 
+[![Build Status](https://travis-ci.org/amplab/ray.svg?branch=master)](https://travis-ci.org/amplab/ray)
+
 Ray is an experimental distributed execution framework with a Python-like
 programming model. It is under development and not ready for general use.
 
diff --git a/setup.sh b/setup.sh
index 0720f3044..288dc8fec 100755
--- a/setup.sh
+++ b/setup.sh
@@ -29,12 +29,13 @@ fi
 if [[ $platform == "linux" ]]; then
   sudo apt-get update
   sudo apt-get install -y git cmake build-essential autoconf curl libtool python-dev python-numpy python-pip libboost-all-dev unzip libjpeg8-dev
+  sudo pip install -r requirements.txt
 elif [[ $platform == "macosx" ]]; then
-  brew install git cmake autoconf libtool boost libjpeg
+  brew install git cmake automake autoconf libtool boost libjpeg
   sudo easy_install pip
   sudo pip install numpy
+  sudo pip install -r requirements.txt --ignore-installed six
 fi
-sudo pip install -r requirements.txt
 cd thirdparty
 ./download_thirdparty.sh
 ./build_thirdparty.sh