diff --git a/tests/docker/xenial/Dockerfile b/tests/docker/bionic/Dockerfile
similarity index 99%
rename from tests/docker/xenial/Dockerfile
rename to tests/docker/bionic/Dockerfile
index f16ae752c..1d9618432 100644
--- a/tests/docker/xenial/Dockerfile
+++ b/tests/docker/bionic/Dockerfile
@@ -22,7 +22,7 @@
 #
 # This file is part of Mbed TLS (https://tls.mbed.org)
 
-FROM ubuntu:xenial
+FROM ubuntu:bionic
 
 ARG MAKEFLAGS_PARALLEL=""
 
diff --git a/tests/scripts/docker_env.sh b/tests/scripts/docker_env.sh
index 6b65b034e..04efa82e4 100755
--- a/tests/scripts/docker_env.sh
+++ b/tests/scripts/docker_env.sh
@@ -38,7 +38,7 @@
 
 
 # default values, can be overridden by the environment
-: ${MBEDTLS_DOCKER_GUEST:=xenial}
+: ${MBEDTLS_DOCKER_GUEST:=bionic}
 
 
 DOCKER_IMAGE_TAG="armmbed/mbedtls-test:${MBEDTLS_DOCKER_GUEST}"