diff --git a/.travis.yml b/.travis.yml
index 59db893..b23ca5f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,7 +10,6 @@ compiler:
 branches:
   only:
     - master
-    - clang-cfi
 
 env:
   - RUNTIME=libicu
@@ -42,11 +41,11 @@ script:
 #  clang-3.4 doesn't know CFI yet.
 #  The only chance with Travis-CI is to switch to docker and use Ubuntu 16.04 or whatever.
 #  - if [[ $CC == "gcc" ]]; then CFI=""; else CFI="--enable-cfi"; fi
-  - ./configure $CFI && make -j4 && make check -j4 || (cat config.log; ls -la /usr/lib/*gold*)
-  - ./configure $CFI --enable-runtime=$RUNTIME --enable-builtin=libicu && make clean && make -j4 && make check -j4
-  - ./configure $CFI --enable-runtime=$RUNTIME --enable-builtin=libidn2 && make clean && make -j4 && make check -j4
-  - ./configure $CFI --enable-runtime=$RUNTIME --enable-builtin=libidn && make clean && make -j4 && make check -j4
-  - ./configure $CFI --enable-runtime=$RUNTIME --disable-builtin && make clean && make -j4 && make check -j4
-  - ./configure --enable-gtk-doc && make -j4 && make check -j4
+  - ./configure $CFI --enable-asan && make -j4 && make check -j4
+  - ./configure $CFI --enable-runtime=$RUNTIME --enable-builtin=libicu --enable-asan && make clean && make -j4 && make check -j4
+  - ./configure $CFI --enable-runtime=$RUNTIME --enable-builtin=libidn2 --enable-asan && make clean && make -j4 && make check -j4
+  - ./configure $CFI --enable-runtime=$RUNTIME --enable-builtin=libidn --enable-asan && make clean && make -j4 && make check -j4
+  - ./configure $CFI --enable-runtime=$RUNTIME --disable-builtin --enable-asan && make clean && make -j4 && make check -j4
+  - ./configure --enable-gtk-doc && make clean && make -j4
   - make distcheck
   - if [[ $CC == "gcc" && $RUNTIME == "libicu" ]]; then ./.travis_coveralls.sh; fi