diff --git a/.travis.yml b/.travis.yml
index b272332..7f60a84 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,28 +6,28 @@ services:
   - redis-server
 matrix:
   include:
-  # Using vendored dependencies
-  - install:
-    - ./dist/travis/install_reproducible.sh
-    script:
-    - ./dist/travis/check.sh
+    # Using vendored dependencies
+    - install:
+        - ./dist/travis/install_reproducible.sh
+      script:
+        - ./dist/travis/check.sh
 
-  # Using HEAD of dependencies
-  - install:
-    - ./dist/travis/install_tip.sh
-    script:
-    - ./dist/travis/check.sh
+    # Using HEAD of dependencies
+    - install:
+        - ./dist/travis/install_tip.sh
+      script:
+        - ./dist/travis/check.sh
 
   allow_failures:
-  # Using HEAD of dependencies
-  - install:
-    - ./dist/travis/install_tip.sh
-    script:
-    - ./dist/travis/check.sh
+    # Using HEAD of dependencies
+    - install:
+        - ./dist/travis/install_tip.sh
+      script:
+        - ./dist/travis/check.sh
 notifications:
   irc:
     channels:
-    - irc.freenode.net#chihaya
+      - irc.freenode.net#chihaya
     use_notice: true
     skip_join: true
     on_success: always
diff --git a/dist/travis/check.sh b/dist/travis/check.sh
old mode 100644
new mode 100755
index 7b51f73..774092a
--- a/dist/travis/check.sh
+++ b/dist/travis/check.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-set -e
+set -ex
 
 go test -v -race $(go list ./...)
 go vet $(go list ./...)
diff --git a/dist/travis/config_redis.yaml b/dist/travis/config_redis.yaml
index 3e55643..5e05708 100644
--- a/dist/travis/config_redis.yaml
+++ b/dist/travis/config_redis.yaml
@@ -39,7 +39,7 @@ chihaya:
       gc_interval: 3m
       peer_lifetime: 31m
       prometheus_reporting_interval: 1s
-      redis_broker: "redis://pwd@127.0.0.1:6379/0"
+      redis_broker: "redis://127.0.0.1:6379/0"
       redis_read_timeout: 15s
       redis_write_timeout: 15s
       redis_connect_timeout: 15s
\ No newline at end of file
diff --git a/dist/travis/install_reproducible.sh b/dist/travis/install_reproducible.sh
old mode 100644
new mode 100755
index fe0fc62..4570135
--- a/dist/travis/install_reproducible.sh
+++ b/dist/travis/install_reproducible.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-set -e
+set -ex
 
 # Install golint and go vet.
 go get -u golang.org/x/lint/golint
diff --git a/dist/travis/install_tip.sh b/dist/travis/install_tip.sh
old mode 100644
new mode 100755
index 1619966..3bbec68
--- a/dist/travis/install_tip.sh
+++ b/dist/travis/install_tip.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-set -e
+set -ex
 
 # Install golint and go vet.
 go get -u golang.org/x/lint/golint