diff --git a/.travis.yml b/.travis.yml
index c228950..f5d229f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,30 @@
 sudo: required
 language: cpp
-before_install: sudo apt-get update
-install: ./install.sh
-script: ant test
-after_script: ./uninstall.sh
+matrix:
+  include:
+    # works on Precise and Trusty
+    - os: linux
+      addons:
+        apt:
+          sources:
+            - ubuntu-toolchain-r-test
+          packages:
+            - g++-6
+      env:
+        - MATRIX_EVAL="CC=gcc-6 && CXX=g++-6"
+
+    - os: osx
+      osx_image: xcode8
+      env:
+        - MATRIX_EVAL="brew cask uninstall oclint && brew install gcc@6 && CC=gcc-6 && CXX=g++-6"
+
+before_install:
+  - eval "${MATRIX_EVAL}"
+install:
+  - ./install.sh
+script:
+  - ant test
+after_script:
+  - ./uninstall.sh
+after_success:
+  - bash <(curl -s https://codecov.io/bash)
diff --git a/install.sh b/install.sh
index 3c1b205..5639e5f 100755
--- a/install.sh
+++ b/install.sh
@@ -1,5 +1,11 @@
-sudo apt-get update
-sudo apt-get install libjsoncpp-dev
+if [ $(uname) == "Darwin" ]; then
+  brew install ant
+  brew install jsoncpp
+else
+  sudo apt-get update
+  sudo apt-get install libjsoncpp-dev
+fi
+
 cp lib/anttasks.jar ~
 pushd ~
 jar xf anttasks.jar
diff --git a/mac_install.sh b/mac_install.sh
deleted file mode 100755
index 0c32d3e..0000000
--- a/mac_install.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-brew install jsoncpp
-cp lib/anttasks.jar ~
-pushd ~
-jar xf anttasks.jar
-pushd -0
diff --git a/mac_uninstall.sh b/mac_uninstall.sh
deleted file mode 100755
index 117094b..0000000
--- a/mac_uninstall.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-brew uninstall jsoncpp
-cd ../
-echo "Deleting project files"
-rm -rf TicketingSystem
-echo "Removing additional installed library"
-rm -rf ~/anttasks.jar
diff --git a/uninstall.sh b/uninstall.sh
index 27d720b..407933e 100755
--- a/uninstall.sh
+++ b/uninstall.sh
@@ -1,4 +1,10 @@
-sudo apt-get remove --purge libjsoncpp-dev
+if [ $(uname) == "Darwin" ]; then
+  brew uninstall jsoncpp
+  brew uninstall ant
+else
+  sudo apt-get remove --purge libjsoncpp-dev
+fi
+
 cd ../
 echo "Deleting project files"
 rm -rf TicketingSystem