diff --git a/.travis.yml b/.travis.yml
index 16d73145..81c3f91b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,10 @@
 sudo: true
 dist: trusty
 language: python
+addons:
+  apt:
+    packages:
+      - expect-dev # for unbuffer
 env:
   global:
   - ETCDVERSION=3.0.17 ZKVERSION=3.4.11 CONSULVERSION=0.7.4
@@ -131,11 +135,11 @@ script:
 
         if [[ $TEST_SUITE != "behave" ]]; then
             echo Running unit tests using python${pv}
-            $TEST_SUITE test
+            unbuffer $TEST_SUITE test
             $TEST_SUITE flake8
         elif [[ $pv != $EXCLUDE_BEHAVE ]]; then
             echo Running acceptance tests using python${pv}
-            if ! PATH=.:/usr/lib/postgresql/9.6/bin:$PATH $TEST_SUITE; then
+            if ! PATH=.:/usr/lib/postgresql/9.6/bin:$PATH unbuffer $TEST_SUITE; then
                 # output all log files when tests are failing
                 grep . features/output/*_failed/*postgres?.*
                 exit 1
diff --git a/Dockerfile b/Dockerfile
index 7ebd03a1..2366a7cd 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -37,6 +37,9 @@ RUN set -ex \
 \
     # haproxy dummy config
     && echo 'global\n        stats socket /run/haproxy/admin.sock mode 660 level admin' > /etc/haproxy/haproxy.cfg \
+\
+    # vim config
+    && echo 'syntax on\nfiletype plugin indent on\nset mouse-=a\nautocmd FileType yaml setlocal ts=2 sts=2 sw=2 expandtab' > /etc/vim/vimrc.local \
 \
     # Prepare postgres/patroni/haproxy environment
     && mkdir -p $PGHOME/.config/patroni /patroni /run/haproxy \
diff --git a/docker-compose.yml b/docker-compose.yml
index 19a26ea2..f3e04d22 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -61,6 +61,7 @@ services:
         image: patroni
         networks: [ demo ]
         env_file: docker/patroni.env
+        hostname: haproxy
         container_name: demo-haproxy
         ports:
             - "5000:5000"
diff --git a/docker/patroni.env b/docker/patroni.env
index 04cc06df..e2993a4d 100644
--- a/docker/patroni.env
+++ b/docker/patroni.env
@@ -1,4 +1,4 @@
-PATRONI_SCOPE=testcluster
+PATRONI_SCOPE=demo
 PATRONI_ETCD_HOSTS='etcd1:2379','etcd2:2379','etcd3:2379'
 
 PATRONI_RESTAPI_USERNAME=admin