diff --git a/.travis.yml b/.travis.yml
index 306c99c716..4b06db8981 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,12 +24,18 @@ install:
 
 before_script:
   - env | sort
+  - wget -qO- 'https://github.com/tianon/pgp-happy-eyeballs/raw/master/hack-my-builds.sh' | bash
   - cd "$VARIANT"
   - slash='/'; image="wordpress:${VARIANT//$slash/-}"
 
 script:
-  - travis_retry docker build -t "$image" .
-  - ~/official-images/test/run.sh "$image"
+  - |
+    (
+      set -Eeuo pipefail
+      set -x
+      docker build -t "$image" .
+      ~/official-images/test/run.sh "$image"
+    )
 
 after_script:
   - docker images
diff --git a/Dockerfile-cli.template b/Dockerfile-cli.template
index 1468495f19..6c4f6625a0 100644
--- a/Dockerfile-cli.template
+++ b/Dockerfile-cli.template
@@ -63,6 +63,7 @@ RUN set -ex; \
 	export GNUPGHOME="$(mktemp -d)"; \
 	gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$WORDPRESS_CLI_GPG_KEY"; \
 	gpg --batch --decrypt --output /usr/local/bin/wp /usr/local/bin/wp.gpg; \
+	command -v gpgconf && gpgconf --kill all || :; \
 	rm -rf "$GNUPGHOME" /usr/local/bin/wp.gpg; \
 	\
 	echo "$WORDPRESS_CLI_SHA512 */usr/local/bin/wp" | sha512sum -c -; \
diff --git a/php5.6/cli/Dockerfile b/php5.6/cli/Dockerfile
index b644bfa300..1317c072be 100644
--- a/php5.6/cli/Dockerfile
+++ b/php5.6/cli/Dockerfile
@@ -63,6 +63,7 @@ RUN set -ex; \
 	export GNUPGHOME="$(mktemp -d)"; \
 	gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$WORDPRESS_CLI_GPG_KEY"; \
 	gpg --batch --decrypt --output /usr/local/bin/wp /usr/local/bin/wp.gpg; \
+	command -v gpgconf && gpgconf --kill all || :; \
 	rm -rf "$GNUPGHOME" /usr/local/bin/wp.gpg; \
 	\
 	echo "$WORDPRESS_CLI_SHA512 */usr/local/bin/wp" | sha512sum -c -; \
diff --git a/php7.0/cli/Dockerfile b/php7.0/cli/Dockerfile
index d517e5c55b..8826842796 100644
--- a/php7.0/cli/Dockerfile
+++ b/php7.0/cli/Dockerfile
@@ -63,6 +63,7 @@ RUN set -ex; \
 	export GNUPGHOME="$(mktemp -d)"; \
 	gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$WORDPRESS_CLI_GPG_KEY"; \
 	gpg --batch --decrypt --output /usr/local/bin/wp /usr/local/bin/wp.gpg; \
+	command -v gpgconf && gpgconf --kill all || :; \
 	rm -rf "$GNUPGHOME" /usr/local/bin/wp.gpg; \
 	\
 	echo "$WORDPRESS_CLI_SHA512 */usr/local/bin/wp" | sha512sum -c -; \
diff --git a/php7.1/cli/Dockerfile b/php7.1/cli/Dockerfile
index 4a9f8101b7..d9ff9b3fab 100644
--- a/php7.1/cli/Dockerfile
+++ b/php7.1/cli/Dockerfile
@@ -63,6 +63,7 @@ RUN set -ex; \
 	export GNUPGHOME="$(mktemp -d)"; \
 	gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$WORDPRESS_CLI_GPG_KEY"; \
 	gpg --batch --decrypt --output /usr/local/bin/wp /usr/local/bin/wp.gpg; \
+	command -v gpgconf && gpgconf --kill all || :; \
 	rm -rf "$GNUPGHOME" /usr/local/bin/wp.gpg; \
 	\
 	echo "$WORDPRESS_CLI_SHA512 */usr/local/bin/wp" | sha512sum -c -; \
diff --git a/php7.2/cli/Dockerfile b/php7.2/cli/Dockerfile
index a9fc8179d2..d14d4657ad 100644
--- a/php7.2/cli/Dockerfile
+++ b/php7.2/cli/Dockerfile
@@ -63,6 +63,7 @@ RUN set -ex; \
 	export GNUPGHOME="$(mktemp -d)"; \
 	gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$WORDPRESS_CLI_GPG_KEY"; \
 	gpg --batch --decrypt --output /usr/local/bin/wp /usr/local/bin/wp.gpg; \
+	command -v gpgconf && gpgconf --kill all || :; \
 	rm -rf "$GNUPGHOME" /usr/local/bin/wp.gpg; \
 	\
 	echo "$WORDPRESS_CLI_SHA512 */usr/local/bin/wp" | sha512sum -c -; \