diff --git a/.travis.yml b/.travis.yml
index 5ad41069..521a3826 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -52,16 +52,34 @@ before_install:
   - go version
   - cmake --version
 before_script:
-  - if [ "$TRAVIS_OS_NAME" = "linux" ]; then CPPFLAGS=-fsanitize=address LDFLAGS="-fsanitize=address -fuse-ld=gold"; fi
-  - if [ "$TRAVIS_OS_NAME" = "osx" ]; then PKG_CONFIG_PATH=/usr/local/opt/libressl/lib/pkgconfig:/usr/local/opt/libxml2/lib/pkgconfig; fi
+  - |
+    if [ "$TRAVIS_OS_NAME" = "linux" ]; then
+      CPPFLAGS="-fsanitize=address" LDFLAGS="-fsanitize=address -fuse-ld=gold"
+    fi
+  - |
+    if [ "$TRAVIS_OS_NAME" = "osx" ]; then
+      PKG_CONFIG_PATH="/usr/local/opt/libressl/lib/pkgconfig:/usr/local/opt/libxml2/lib/pkgconfig"
+    fi
   # Now build nghttp2
-  - if [ "$CI_BUILD" = "autotools" ]; then autoreconf -i; fi
   - git submodule update --init
-  - if [ "$CI_BUILD" = "autotools" ]; then ./configure --with-mruby PKG_CONFIG_PATH=$PKG_CONFIG_PATH; fi
-  - if [ "$CI_BUILD" = "cmake" ]; then cmake -DENABLE_WERROR=1 -DWITH_MRUBY=1 -DWITH_NEVERBLEED=1; fi
+  - |
+    if [ "$CI_BUILD" = "autotools" ]; then
+      autoreconf -i
+      ./configure --with-mruby PKG_CONFIG_PATH=$PKG_CONFIG_PATH
+    fi
+  - |
+    if [ "$CI_BUILD" = "cmake" ]; then
+      cmake -DENABLE_WERROR=1 -DWITH_MRUBY=1 -DWITH_NEVERBLEED=1
+    fi
 script:
-  - if [ "$CI_BUILD" = "autotools" ]; then make distcheck DISTCHECK_CONFIGURE_FLAGS="--with-mruby --with-neverbleed --enable-werror CPPFLAGS=$CPPFLAGS LDFLAGS=\"$LDFLAGS\" PKG_CONFIG_PATH=$PKG_CONFIG_PATH"; fi
-  - if [ "$CI_BUILD" = "cmake" ]; then make check; fi
+  - |
+    if [ "$CI_BUILD" = "autotools" ]; then
+      make distcheck DISTCHECK_CONFIGURE_FLAGS="--with-mruby --with-neverbleed --enable-werror CPPFLAGS=$CPPFLAGS LDFLAGS=\"$LDFLAGS\" PKG_CONFIG_PATH=$PKG_CONFIG_PATH"
+    fi
+  - |
+    if [ "$CI_BUILD" = "cmake" ]; then
+      make check
+    fi
   # As of April, 23, 2016, golang http2 build fails, probably because
   # the default go version is too old.
   # - cd integration-tests