diff --git a/Makefile b/Makefile
index 090f5da0099..6bc3fced6e2 100644
--- a/Makefile
+++ b/Makefile
@@ -251,8 +251,12 @@ docker_local:
 docker_mini:
 	${call build_docker_image,docker/mini/Dockerfile,vitess/mini}
 
-docker_vttestserver:
-	${call build_docker_image,docker/vttestserver/Dockerfile.mysql57,vitess/vttestserver}
+DOCKER_VTTESTSERVER_SUFFIX = mysql57 mysql80
+DOCKER_VTTESTSERVER_TARGETS = $(addprefix docker_vttestserver_,$(DOCKER_VTTESTSERVER_SUFFIX))
+$(DOCKER_VTTESTSERVER_TARGETS): docker_vttestserver_%:
+	${call build_docker_image,docker/vttestserver/Dockerfile.$*,vitess/vttestserver:$*}
+
+docker_vttestserver: $(DOCKER_VTTESTSERVER_TARGETS)
 
 # This rule loads the working copy of the code into a bootstrap image,
 # and then runs the tests inside Docker.