diff --git a/.travis-scripts/install.sh b/.travis-scripts/install.sh
new file mode 100755
index 0000000000..bd6dc8129a
--- /dev/null
+++ b/.travis-scripts/install.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+if [[ $TRAVIS_OS_NAME == 'osx' ]]; then
+
+    # Install some custom requirements on OS X
+    wget --no-cookies --no-check-certificate --header "Cookie: gpw_e24=http%3A%2F%2Fwww.oracle.com%2F; oraclelicense=accept-securebackup-cookie" http://download.oracle.com/otn-pub/java/jdk/8u66-b17/jdk-8u66-macosx-x64.dmg
+    hdiutil mount jdk-8u66-macosx-x64.dmg
+    sudo installer -pkg /Volumes/JDK\ 8\ Update\ 66/JDK\ 8\ Update\ 66.pkg -target LocalSystem
+else
+    export DISPLAY=:99.0
+    sh -e /etc/init.d/xvfb start
+    pip install --user codecov
+fi
\ No newline at end of file
diff --git a/.travis-scripts/push-javadoc-to-gh-pages.sh b/.travis-scripts/push-javadoc-to-gh-pages.sh
index 412f43e222..4d2084a431 100755
--- a/.travis-scripts/push-javadoc-to-gh-pages.sh
+++ b/.travis-scripts/push-javadoc-to-gh-pages.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # Source of file: http://benlimmer.com/2013/12/26/automatically-publish-javadoc-to-gh-pages-with-travis-ci/
-if [ "$TRAVIS_REPO_SLUG" == "WPIRoboticsProjects/GRIP" ] && [ "$TRAVIS_JDK_VERSION" == "oraclejdk8" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_BRANCH" == "master" ]; then
+if [ "$TRAVIS_REPO_SLUG" == "WPIRoboticsProjects/GRIP" ] && [ "$TRAVIS_JDK_VERSION" == "oraclejdk8" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_BRANCH" == "master" ] && [[ "$TRAVIS_OS_NAME" != "osx" ]]; then
 
   echo -e "Generating javadoc...\n"
   ./gradlew aggregateJavadocs
diff --git a/.travis.yml b/.travis.yml
index 2ac00611f5..dc507e598c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,11 @@
 # NOTE: Don't use `sudo` anywhere or the build will run on Travis's slower, outdated build system
 language: java
-jdk:
-  - oraclejdk8
+
+matrix:
+  include:
+    - os: linux
+      jdk: oraclejdk8
+    - os: osx
 
 # GCC needs to be 4.8 or higher so that GOMP_4.0 is installed for opencv
 # This is incredibly hard to track down, find the solution for and fix.
@@ -17,9 +21,7 @@ addons:
       - oracle-java8-installer
 
 before_install:
-  - export DISPLAY=:99.0
-  - sh -e /etc/init.d/xvfb start
-  - pip install --user codecov
+  - .travis-scripts/install.sh
 
 # Only do an assemble when we aren't building a pull request
 install:
@@ -29,7 +31,7 @@ script:
   - ./gradlew check --stacktrace -Pheadless=true
 
 after_success:
-  - codecov
+  - if [[ "$TRAVIS_OS_NAME" != "osx" ]]; then codecov         ; fi
   - .travis-scripts/push-javadoc-to-gh-pages.sh
   - .travis-scripts/before-deploy.sh
 
@@ -47,15 +49,12 @@ env:
   global:
     secure: f90qqcA5inkHmYUK6WNITkSPbalpw+r+6nzykPdN30ahB8OUupYxoJxFknxw74raPQ69IgsDF+f8RihEBNIjH8TiMihkcwbkUGGfYaON+sVdvV/GgRQcUk0tm/wrWxRiB1qOYfsvU4sdyvFWBtAbeuhBH1JMLlQGaFjHTJOUwCjm3iEW0CKC9btsgcZIvIrHkP2KNHUMD2iBs6BJ4W448ElQTBBnaoInWUm/ecV+nNUX9yT1CpVWABVuioUkSWSm7eMiqYnvm4J9+LUh8+IMYyodO2hjPWlQ18yhmP9kSlGpQT6pRZjCRd394GE8plKxxWwp9CVXyUY/KQiYoNMRQaAiwuNnXrCi2Et1Fp8+MzQjpl+2CWbdtPwqGhKrGICfhPHvswNE2jM7VLAu/8Gn+ubhKuYfiibska5tXDBknrVbOiV1s9h3y3hI2WyyUg+T1ZsirhGVzMSmDk4HZnLUf7uEEMZEMQzLC0yk495TTZ2zihRnAkOXhNd24lHVwns2WSu0BKvawaDlfQinCbddKGNXE0cdkDvO9xk4IsbioRJ3w8DhBdL4HAEw/Gzx5N3xEVXgOAtwoP+zH2b3LIXQvP5pkuyna48R9L7Fc+EXUmejuRUmjQQMbsdLbx6Ci8gnd6Xq7CYvwry6t3R0GKuCwziuZNl44doHYR6MK7CDBWo=
 
-os:
-  - linux
-
 deploy:
   provider: releases
   api_key:
     secure: bdjiFXG3VBcM1iyxeputsWA9vHxgLNcxRB1i0REDNAnIEvDWpAdVr1jPBejeiOEw9s+k6EItATvQ2I7Xp5iKnYaXn0NuHzM3OSY8WNVCc+gBTaQwkijPBqi/vEXaO502CscW+H2U26QZGS/jJiUuieeErtzCNcWmCv8SRc5NFOVYdSlhAmp+aPeu2YwuweiMZNVquYM2hx7murghOYSF5hQTKq4/zrziENVi78XZS8rJFmxwOGqNj1GBLul2F9poIPjzDbPVJLeXTJEY+N3aYGJ4GyZYf6p8ynDO/v043/GuOAyNfkgSwhCcTQlmLG/mm6P9CUMoDQR9klh2eDswgrIP4rGLwILg3035nqHqwgTIKVXfspni3P/65siS6lXV0M5flEkRysMBr1GQhaIEUM32ArreMzAtC2Vn2CviKG0TwLmxyd/7W3JdoX4KrHAcKBwbqFDImWw43S6N63oTUEw6GjrI+CndwgF9RNgr5SAyS28LFXViOJe7JlGVUNU33kMNpEJxzVREzkJsO8aicaZTrvDniFOfg2WhrAyhjxmh4/IOHDE6qgtxw+2+TUzMlwdzdxb90BeXg2XfMichmKfQYQFEmZntCZcoHHDG5jbCTyAvFuOv6tdPjpr69QjiEJhEbohw8CEwoGhy1kxxQcCDCfABrOTivJ39Ui8MC6k=
   file_glob: true
-  file: "ui/build/distributions/*.deb"
+  file: "ui/build/distributions/*.{deb,pkg,dmg}"
   skip_cleanup: true
   on:
     repo: WPIRoboticsProjects/GRIP