diff --git a/.travis.yml b/.travis.yml
index e60a4b45c..11b4078ff 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,21 +20,7 @@ script: tools/travis.sh
 
 matrix:
   include:
-  - env: TIG_BUILD=valgrind
-    script: tools/travis.sh
-  - env: TIG_BUILD=address-sanitizer
+  - os: osx
+    env: TIG_BUILD=brew
     compiler: clang
-    # LeakSanitizer requires ptrace capabilities
-    # https://github.com/travis-ci/travis-ci/issues/9033
-    sudo: required
     script: tools/travis.sh
-  - if: branch = master
-    os: osx
-    env:
-    compiler: clang
-    script: brew install --HEAD tig
-  - if: branch = master
-    os: osx
-    env:
-    compiler: gcc
-    script: brew install --HEAD tig
diff --git a/tools/travis.sh b/tools/travis.sh
index a8af33959..1445399ae 100755
--- a/tools/travis.sh
+++ b/tools/travis.sh
@@ -45,11 +45,17 @@ build_valgrind() {
 	make all-debug test TEST_OPTS=valgrind
 }
 
+build_brew() {
+	brew update
+	brew install --HEAD tig
+}
+
 case "$TIG_BUILD" in
 	config.make)		build_config_make ;;
 	autoconf)		build_autoconf ;;
 	address-sanitizer)	build_address_sanitizer ;;
 	valgrind)		build_valgrind ;;
+	brew)			build_brew ;;
 
 	*)
 		echo "Unknown config: $TIG_BUILD"