diff --git a/.travis.yml b/.travis.yml
index e0daa5fb943..d809e16f41d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,19 +1,19 @@
 language: c
 
+os:
+- linux
+- osx
+
 install:
-  - sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
-  - sudo apt-get update -q
-  - sudo apt-get install -qq --force-yes -y autoconf2.13 gperf libxxf86vm-dev libglfw-dev libstdc++6-4.7-dev
-  - echo ttf-mscorefonts-installer msttcorefonts/accepted-mscorefonts-eula select true | sudo debconf-set-selections
-  - sudo apt-get install ttf-mscorefonts-installer > /dev/null
+- if [ "${TRAVIS_OS_NAME}" = "linux" ]; then  ./travis.linux.install.deps.sh; fi
+- if [ "${TRAVIS_OS_NAME}" = "osx" ]; then ./travis.osx.install.deps.sh; fi
+
 before_script:
   - mkdir -p build
 
-script: |
-  cd build
-  ../configure
-  make -j2
-  make check
+script: 
+- if [ "${TRAVIS_OS_NAME}" = "linux" ]; then  ./travis.linux.script.sh; fi
+- if [ "${TRAVIS_OS_NAME}" = "osx" ]; then ./travis.osx.script.sh; fi
 
 git:
   submodules: true
@@ -25,4 +25,5 @@ branches:
   only:
     - travis
     - master
+
 after_success:
diff --git a/travis.linux.install.deps.sh b/travis.linux.install.deps.sh
new file mode 100755
index 00000000000..a7e7b042d36
--- /dev/null
+++ b/travis.linux.install.deps.sh
@@ -0,0 +1,5 @@
+sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
+sudo apt-get update -q
+sudo apt-get install -qq --force-yes -y autoconf2.13 gperf libxxf86vm-dev libglfw-dev libstdc++6-4.7-dev
+echo ttf-mscorefonts-installer msttcorefonts/accepted-mscorefonts-eula select true | sudo debconf-set-selections
+sudo apt-get install ttf-mscorefonts-installer > /dev/null
diff --git a/travis.linux.script.sh b/travis.linux.script.sh
new file mode 100755
index 00000000000..e8e8205a4bd
--- /dev/null
+++ b/travis.linux.script.sh
@@ -0,0 +1,3 @@
+cd build
+../configure
+make -j2 && make check-servo
diff --git a/travis.osx.install.deps.sh b/travis.osx.install.deps.sh
new file mode 100755
index 00000000000..9833b2c39a5
--- /dev/null
+++ b/travis.osx.install.deps.sh
@@ -0,0 +1,2 @@
+brew install https://raw.github.com/Homebrew/homebrew-versions/master/autoconf213.rb
+brew install automake libtool pkg-config
diff --git a/travis.osx.script.sh b/travis.osx.script.sh
new file mode 100755
index 00000000000..6eaa0885116
--- /dev/null
+++ b/travis.osx.script.sh
@@ -0,0 +1,3 @@
+cd build
+../configure
+make -j2 && make check-servo && make check-content && make check-ref-cpu