diff --git a/.travis.yml b/.travis.yml
index 56c8b7bbbd..5e7c79a9c0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,8 +1,11 @@
 language: java
 sudo: required
-dist: bionic
-os:
- - linux
+
+jobs:
+  include:
+    - os: linux
+       dist bionic
+    - os: osx
 
 env:
  global:
@@ -12,6 +15,7 @@ addons:
   apt:
     update: true
     packages:
+    - testdisk
     - libafflib-dev
     - libewf-dev
     - libpq-dev
@@ -29,11 +33,13 @@ addons:
     update: true
     packages:
     - ant
-    - ant-optional
+    - wget
+    - libpq
     - libewf
     - gettext
     - cppunit
     - afflib
+    - testdisk
 
 python:
   - "2.7"
@@ -43,7 +49,6 @@ before_install:
  - python setupSleuthkitBranch.py
 
 install:
- - sudo apt-get install testdisk
  - cd sleuthkit/sleuthkit
  - ./travis_install_libs.sh
 
@@ -54,12 +59,22 @@ before_script:
         export PATH=/usr/bin:$PATH; 
         unset JAVA_HOME;
     fi
+  - if [ $TRAVIS_OS_NAME = osx ]; then
+        brew uninstall java --force;
+        brew cask uninstall java --force;
+        brew tap adoptopenjdk/openjdk;
+        brew cask install adoptopenjdk8;
+        wget https://cdn.azul.com/zulu/bin/zulu8.40.0.25-ca-fx-jdk8.0.222-macosx_x64.tar.gz;
+        sudo tar xf  zulu8.40.0.25-ca-fx-jdk8.0.222-macosx_x64.tar.gz --strip-components=1 -C /Library/Java/JavaVirtualMachines/adoptopenjdk-8.jdk/Contents/Home;
+        export JAVA_HOME=/Library/Java/JavaVirtualMachines/adoptopenjdk-8.jdk/Contents/Home;
+    fi
+  - java -version
 
 script:
  - set -e
  - echo "Building TSK..."
  - ./bootstrap && ./configure --prefix=/usr && make
- - pushd bindings/java/ && ant -q dist-PostgreSQL && popd
+ - pushd bindings/java && ant dist-PostgreSQL && popd
  - echo "Building Autopsy..." && echo -en 'travis_fold:start:script.build\\r'
  - cd $TRAVIS_BUILD_DIR/
  - ant build
diff --git a/travis_build.sh b/travis_build.sh
new file mode 100644
index 0000000000..d25d52d6ae
--- /dev/null
+++ b/travis_build.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+set -e
+echo "Building TSK..."
+cd sleuthkit/sleuthkit
+./bootstrap && configure --prefix=/usr && make
+pushd bindings/java && ant -q dist-PostgreSQL && popd
+
+echo "Building Autopsy..." && echo -en 'travis_fold:start:script.build\\r'
+cd $TRAVIS_BUILD_DIR/
+ant build
+echo -en 'travis_fold:end:script.build\\r'