diff --git a/.travis.yml b/.travis.yml
index 7260420..8abd76c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,10 +2,14 @@ language: c
 install:
     - sudo apt-get update
     - sudo apt-get -y install libtool pkg-config libexpat1-dev libxml2-dev libssl-dev check
-script:
+before_script:
     - ./bootstrap.sh
-    - ./configure --without-libxml2 && make CFLAGS="-Wall -Werror" && make CFLAGS="-Wall -Werror" check-TESTS
-    - make clean
-    - ./configure --with-libxml2 && make CFLAGS="-Wall -Werror" && make CFLAGS="-Wall -Werror" check-TESTS
-    - make clean
-    - ./configure --disable-tls && make CFLAGS="-Wall -Werror" && make CFLAGS="-Wall -Werror" check-TESTS
+script:
+    - ./configure ${CONFIGURE_OPT} && make CFLAGS="-Wall -Werror" && make CFLAGS="-Wall -Werror" check-TESTS
+env:
+    - CONFIGURE_OPT="--without-libxml2"
+    - CONFIGURE_OPT="--with-libxml2"
+    - CONFIGURE_OPT="--disable-tls --without-libxml2"
+    - CONFIGURE_OPT="--disable-tls --with-libxml2"
+matrix:
+    fast_finish: true