diff --git a/.travis.yml b/.travis.yml
index b55640a..a827666 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,5 @@
 sudo: required
-dist: xenial
+dist: bionic
 
 os: linux
 
@@ -20,7 +20,7 @@ addons:
 linux-s390x: &linux-s390x
   os: linux
   arch: s390x
-  dist: xenial
+  dist: bionic
   compiler: gcc
   addons:
       apt:
@@ -47,7 +47,7 @@ linux-s390x: &linux-s390x
     - sudo ln -s /usr/bin/make /usr/bin/gmake
   script:
     - util/mirror-tarballs > build.log 2>&1 || (cat build.log && exit 1)
-    - cd openresty-*
+    - cd "openresty-$(./util/ver)"
     - ./configure --prefix=$OPENRESTY_PREFIX --with-cc-opt="-I$PCRE_INC -I$OPENSSL_INC" --with-ld-opt="-L$PCRE_LIB -L$OPENSSL_LIB -Wl,-rpath,$PCRE_LIB:$OPENSSL_LIB" --with-pcre-jit --with-http_ssl_module --with-debug -j$JOBS > build.log 2>&1 || (cat build.log && exit 1)
     - make -j$JOBS > build.log 2>&1 || (cat build.log && exit 1)
     - sudo make install > build.log 2>&1 || (cat build.log && exit 1)
@@ -59,7 +59,7 @@ linux-s390x: &linux-s390x
 linux-ppc64le: &linux-ppc64le
   os: linux
   arch: ppc64le
-  dist: xenial
+  dist: bionic
   compiler: gcc
   addons:
       apt:
@@ -86,7 +86,7 @@ linux-ppc64le: &linux-ppc64le
     - sudo ln -s /usr/bin/make /usr/bin/gmake
   script:
     - util/mirror-tarballs > build.log 2>&1 || (cat build.log && exit 1)
-    - cd openresty-*
+    - cd "openresty-$(./util/ver)"
     - ./configure --prefix=$OPENRESTY_PREFIX --with-cc-opt="-I$PCRE_INC -I$OPENSSL_INC" --with-ld-opt="-L$PCRE_LIB -L$OPENSSL_LIB -Wl,-rpath,$PCRE_LIB:$OPENSSL_LIB" --with-pcre-jit --with-http_ssl_module --with-debug -j$JOBS > build.log 2>&1 || (cat build.log && exit 1)
     - make -j$JOBS > build.log 2>&1 || (cat build.log && exit 1)
     - sudo make install > build.log 2>&1 || (cat build.log && exit 1)
@@ -147,7 +147,7 @@ install:
 
 script:
   - util/mirror-tarballs > build.log 2>&1 || (cat build.log && exit 1)
-  - cd openresty-*
+  - cd "openresty-$(./util/ver)"
   - ./configure --prefix=$OPENRESTY_PREFIX --with-cc-opt="-I$PCRE_INC -I$OPENSSL_INC" --with-ld-opt="-L$PCRE_LIB -L$OPENSSL_LIB -Wl,-rpath,$PCRE_LIB:$OPENSSL_LIB" --with-pcre-jit --with-http_ssl_module --with-debug -j$JOBS > build.log 2>&1 || (cat build.log && exit 1)
   - make -j$JOBS > build.log 2>&1 || (cat build.log && exit 1)
   - sudo make install > build.log 2>&1 || (cat build.log && exit 1)
@@ -155,4 +155,4 @@ script:
   - export PATH=$OPENRESTY_PREFIX/bin:$OPENRESTY_PREFIX/nginx/sbin:$PATH
   - nginx -V
   - ldd `which nginx`|grep -E 'luajit|ssl|pcre'
-  - prove -r t/
+  - prove -I. -r t/