diff --git a/.travis.yml b/.travis.yml
index b07625a561..4c675666a7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -61,6 +61,18 @@ matrix:
       env: CI_MODE=release
     - php: "7.0"
       env: CI_MODE=docs
+    - os: osx
+      language: generic
+      env: CI_MODE=test
+      before_install:
+        - brew tap homebrew/php
+        - brew update
+        - brew install ant gettext php70 mariadb
+        - brew link --force gettext
+        - curl https://getcomposer.org/installer | php
+        - ln -s /Users/travis/build/phpmyadmin/phpmyadmin/composer.phar /usr/local/bin/composer
+        - mysql.server start
+
 cache:
   directories:
     - $HOME/.composer/cache/
diff --git a/test/ci-test b/test/ci-test
index 49f87891f8..da8bd65c60 100755
--- a/test/ci-test
+++ b/test/ci-test
@@ -4,7 +4,7 @@ ant locales
 
 export PHPUNIT_ARGS="--exclude-group selenium"
 
-if [ $TRAVIS_PHP_VERSION = "hhvm" ] ; then
+if [ "$TRAVIS_PHP_VERSION" = "hhvm" ] ; then
     ant phpunit-hhvm
 else
     ant phpunit
diff --git a/test/install-runkit b/test/install-runkit
index 7fde346b05..180d4ca139 100755
--- a/test/install-runkit
+++ b/test/install-runkit
@@ -6,7 +6,7 @@ if [ -n "$GATEWAY_INTERFACE" ] ; then
     exit 1
 fi
 
-if [ "$TRAVIS_PHP_VERSION" = "nightly" -o "$TRAVIS_PHP_VERSION" = "hhvm" -o "$TRAVIS_PHP_VERSION" = "7.0" -o "$TRAVIS_PHP_VERSION" = "7.1" ] ; then
+if [ "$TRAVIS_PHP_VERSION" = "nightly" -o "$TRAVIS_PHP_VERSION" = "hhvm" -o "$TRAVIS_PHP_VERSION" = "7.0" -o "$TRAVIS_PHP_VERSION" = "7.1" -o "$TRAVIS_OS_NAME" = "osx" ] ; then
     exit 0
 fi