diff --git a/tests/Dockerfile b/tests/Dockerfile
index 53fde83e9..d2c4a71f9 100644
--- a/tests/Dockerfile
+++ b/tests/Dockerfile
@@ -4,8 +4,12 @@ FROM ${PYTHON_IMAGE}
 RUN apt-get update && apt-get -y --no-install-recommends install ca-certificates curl python-virtualenv &&\
     rm -rf /var/lib/apt/lists/*
 
-# connection to ha.pool.sks-keyservers.net fails sometimes, so let's retry a couple times
-RUN for i in $(seq 1 5); do gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 && s=0 && break || s=$? && sleep 5; done; (exit $s)
+# connection to ha.pool.sks-keyservers.net fails sometimes, so let's retry with couple different servers
+RUN for server in $(shuf -e ha.pool.sks-keyservers.net \
+                            hkp://p80.pool.sks-keyservers.net:80 \
+                            keyserver.ubuntu.com \
+                            hkp://keyserver.ubuntu.com:80 \
+                            pgp.mit.edu) ; do gpg --keyserver "$server" --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 && s=0 && break || s=$?; done; (exit $s)
 
 RUN curl -o /usr/local/bin/gosu -SL "https://github.com/tianon/gosu/releases/download/1.10/gosu-$(dpkg --print-architecture)" \
     && curl -o /usr/local/bin/gosu.asc -SL "https://github.com/tianon/gosu/releases/download/1.10/gosu-$(dpkg --print-architecture).asc" \
diff --git a/tests/DockerfileDocs b/tests/DockerfileDocs
index 386eb2d4a..e0bab507c 100644
--- a/tests/DockerfileDocs
+++ b/tests/DockerfileDocs
@@ -4,8 +4,12 @@ RUN apt-get update && \
     apt-get install -y xsltproc ca-certificates libxml2-utils build-essential git curl python2.7 && \
 		rm -rf /var/lib/apt/lists/*
 
-# connection to ha.pool.sks-keyservers.net fails sometimes, so let's retry a couple times
-RUN for i in $(seq 1 5); do gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 && s=0 && break || s=$? && sleep 5; done; (exit $s)
+# connection to ha.pool.sks-keyservers.net fails sometimes, so let's retry with couple different servers
+RUN for server in $(shuf -e ha.pool.sks-keyservers.net \
+                            hkp://p80.pool.sks-keyservers.net:80 \
+                            keyserver.ubuntu.com \
+                            hkp://keyserver.ubuntu.com:80 \
+                            pgp.mit.edu) ; do echo "Trying $server"; gpg --keyserver "$server" --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 && s=0 && break || s=$?; done; (exit $s)
 
 RUN curl -o /usr/local/bin/gosu -SL "https://github.com/tianon/gosu/releases/download/1.10/gosu-$(dpkg --print-architecture)" \
     && curl -o /usr/local/bin/gosu.asc -SL "https://github.com/tianon/gosu/releases/download/1.10/gosu-$(dpkg --print-architecture).asc" \