diff --git a/.travis.yml b/.travis.yml
index 04d5c90..bc145be 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,36 +1,12 @@
 os:
   - linux
+  - osx
 language: cpp
 compiler:
   - gcc
   - clang
 install:
-  - sudo sh -c 'echo "deb http://packages.ros.org/ros/ubuntu precise main" > /etc/apt/sources.list.d/ros-latest.list'
-  - wget http://packages.ros.org/ros.key -O - | sudo apt-key add -
-  - sudo apt-get update
-  - sudo apt-get install ros-hydro-catkin libboost-dev
-  - source /opt/ros/hydro/setup.bash
-script:
-  - make && make test
-
----
-
-os:
-  - osx
-language: cpp
-before_install:
-  - brew update
-  - brew outdated boost || brew install boost
-  - sudo pip install rosinstall_generator wstool rosdep
-  - sudo rosdep init
-  - rosdep update
-  - mkdir catkin_ws
-  - cd catkin_ws
-  - rosinstall_generator catkin --rosdistro hydro --tar > catkin.rosinstall
-  - wstool init src catkin.rosinstall
-  - rosdep install --from-paths src --ignore-src -y
-  - ./src/catkin/bin/catkin_make install
-  - cd -
-  - source catkin_ws/install/setup.bash
+  - make install_deps
+  - source setup.bash
 script:
   - make && make test
diff --git a/Makefile b/Makefile
index 5816275..e474396 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,29 @@
 all: serial
 
 CMAKE_FLAGS := -DCMAKE_INSTALL_PREFIX=/tmp/usr/local
+UNAME := $(shell uname -s)
+
+install_deps:
+ifeq ($(UNAME),Darwin)
+	brew tap ros/deps
+	brew update
+	brew outdated boost || brew upgrade boost || brew install boost
+	sudo pip install rosinstall_generator wstool rosdep
+	sudo rosdep init
+	rosdep update
+	mkdir catkin_ws
+	cd catkin_ws && rosinstall_generator catkin --rosdistro hydro --tar > catkin.rosinstall
+	cd catkin_ws && wstool init src catkin.rosinstall
+	cd catkin_ws && rosdep install --from-paths src --ignore-src -y
+	cd catkin_ws && ./src/catkin/bin/catkin_make install
+	echo "source catkin_ws/install/setup.bash" > setup.bash
+else
+	sudo sh -c 'echo "deb http://packages.ros.org/ros/ubuntu precise main" > /etc/apt/sources.list.d/ros-latest.list'
+	wget http://packages.ros.org/ros.key -O - | sudo apt-key add -
+	sudo apt-get update
+	sudo apt-get install ros-hydro-catkin libboost-dev
+	echo "source /opt/ros/hydro/setup.bash" > setup.bash
+endif
 
 install:
 	cd build && make install