diff --git a/.travis.yml b/.travis.yml
index f0c4fe7fea..f566842b8b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -67,7 +67,7 @@ matrix:
       before_install:
         - brew tap homebrew/php
         - brew update
-        - brew install ant gettext php70 mariadb
+        - brew install gettext php70 mariadb
         - brew link --force gettext
         - curl https://getcomposer.org/installer | php
         - ln -s "`pwd`/composer.phar" /usr/local/bin/composer
diff --git a/test/ci-lint b/test/ci-lint
index f4ae3eb7cc..12ee34618a 100755
--- a/test/ci-lint
+++ b/test/ci-lint
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 if [ -z "$TRAVIS_COMMIT_RANGE" ] ; then
-    ant lint
+    find . -name '*.php' -not -path './vendor/*' | xargs -n1 -r php -l
 else
     git diff --name-only $TRAVIS_COMMIT_RANGE -- '*.php' | xargs -n1 -r php -l
 fi
diff --git a/test/ci-selenium b/test/ci-selenium
index c964e387df..d5d6b91dfb 100755
--- a/test/ci-selenium
+++ b/test/ci-selenium
@@ -1,5 +1,3 @@
 #!/bin/sh
 
-export PHPUNIT_ARGS="--group selenium --debug"
-
-ant phpunit-nocoverage
+./vendor/bin/phpunit --configuration phpunit.xml.nocoverage --group selenium --debug
diff --git a/test/ci-test b/test/ci-test
index e427dfb727..1bd4497897 100755
--- a/test/ci-test
+++ b/test/ci-test
@@ -1,9 +1,12 @@
 #!/bin/sh
 
-export PHPUNIT_ARGS="--exclude-group selenium"
+case "$TRAVIS_PHP_VERSION" in
+    hhvm*)
+        CONFIG=phpunit.xml.hhvm
+        ;;
+    *)
+        CONFIG=phpunit.xml.dist
+        ;;
+esac
 
-if [ "$TRAVIS_PHP_VERSION" = "hhvm" ] ; then
-    ant phpunit-hhvm
-else
-    ant phpunit
-fi
+./vendor/bin/phpunit --configuration $CONFIG --exclude-group selenium