diff --git a/.autobahn.sh b/.autobahn.sh
index ab34a51..f994374 100755
--- a/.autobahn.sh
+++ b/.autobahn.sh
@@ -65,6 +65,7 @@ install_autobahn() {
             && pip install --upgrade pip \
             && pip install autobahntestsuite
     else
+        pip install --upgrade pip
         pip install autobahntestsuite
     fi
 }
diff --git a/.travis.yml b/.travis.yml
index 5c2753f..7c683c3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,19 +16,20 @@ matrix:
       dist: xenial
       sudo: required
       services: docker
-      env: DOCKER_IMAGE=swift:5.0.1-xenial DOCKER_PRIVILEGED=true DOCKER_PACKAGES="libz-dev" 
+      env: DOCKER_IMAGE=swift:5.0.2-xenial DOCKER_PRIVILEGED=true DOCKER_PACKAGES="libz-dev" 
     - os: linux
       dist: xenial
       sudo: required
       services: docker
-      env: DOCKER_IMAGE=swift:5.0.1 SWIFT_SNAPSHOT=$SWIFT_DEVELOPMENT_SNAPSHOT DOCKER_PRIVILEGED=true DOCKER_PACKAGES="libz-dev"
+      env: DOCKER_IMAGE=swift:5.0.2 SWIFT_SNAPSHOT=$SWIFT_DEVELOPMENT_SNAPSHOT DOCKER_PRIVILEGED=true DOCKER_PACKAGES="libz-dev"
     - os: osx
       osx_image: xcode10.2
       sudo: required
+      env: CUSTOM_TEST_SCRIPT=.autobahn.sh
     - os: osx
-      osx_image: xcode10.2
+      osx_image: xcode11
       sudo: required
-      env: SWIFT_SNAPSHOT=$SWIFT_DEVELOPMENT_SNAPSHOT CUSTOM_TEST_SCRIPT=.autobahn.sh
+      env: SWIFT_SNAPSHOT=$SWIFT_DEVELOPMENT_SNAPSHOT
 
 before_install:
   - git clone https://github.com/IBM-Swift/Package-Builder.git