diff --git a/.coveralls.yml b/.coveralls.yml
index c3912fbdf07de..31b64e137d0cc 100644
--- a/.coveralls.yml
+++ b/.coveralls.yml
@@ -1,2 +1,2 @@
 service_name: travis-ci
-repo_token: bFwjIppLtIFrDeKZf9tynR2ONLGPgdDg6
+repo_token: D9Tg4c2TGmHUBQIWbixm9NtIosNUDJeRo
diff --git a/.travis.yml b/.travis.yml
index 70d284ea459c2..66c40e7c9b7f2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -45,10 +45,11 @@ script:
   - "make reinstall-p2 > /dev/null"
   - make init
   - DEBUG=1 LAMBDA_EXECUTOR=docker-reuse USE_SSL=1 make test
+  # build Docker image
+  - make docker-build
   # run Java tests
   - make test-java-if-changed
-  # build Docker image, and push it (if on master branch)
-  - make docker-build
+  # push Docker image (if on master branch)
   - make docker-push-master
 
 after_success:
diff --git a/README.md b/README.md
index 6eda838f29090..58c7983e7c009 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-[![Build Status](https://travis-ci.org/localstack/localstack.png)](https://travis-ci.org/localstack/localstack) [![Backers on Open Collective](https://opencollective.com/localstack/backers/badge.svg)](#backers) [![Sponsors on Open Collective](https://opencollective.com/localstack/sponsors/badge.svg)](#sponsors) [![Coverage Status](https://coveralls.io/repos/github/atlassian/localstack/badge.svg?branch=master)](https://coveralls.io/github/atlassian/localstack?branch=master)
+[![Build Status](https://travis-ci.org/localstack/localstack.png)](https://travis-ci.org/localstack/localstack) [![Backers on Open Collective](https://opencollective.com/localstack/backers/badge.svg)](#backers) [![Sponsors on Open Collective](https://opencollective.com/localstack/sponsors/badge.svg)](#sponsors) [![Coverage Status](https://coveralls.io/repos/github/localstack/localstack/badge.svg?branch=master)](https://coveralls.io/github/atlassian/localstack?branch=master)
 [![Gitter](https://img.shields.io/gitter/room/localstack/Platform.svg)](https://gitter.im/localstack/Platform)
 [![PyPI Version](https://badge.fury.io/py/localstack.svg)](https://badge.fury.io/py/localstack)
 [![PyPI License](https://img.shields.io/pypi/l/localstack.svg)](https://img.shields.io/pypi/l/localstack.svg)