diff --git a/docker/Makefile b/docker/Makefile
index 4163f79b..d6b77a9f 100644
--- a/docker/Makefile
+++ b/docker/Makefile
@@ -1,5 +1,5 @@
-SCALA_VERSION?=2.12
-KAFKA_VERSION?=1.1.1
+SCALA_VERSION?=2.13
+KAFKA_VERSION?=2.8.1
 IMAGE_NAME?=aiolibs/kafka
 IMAGE_TAG=$(IMAGE_NAME):$(SCALA_VERSION)_$(KAFKA_VERSION)
 
diff --git a/tests/conftest.py b/tests/conftest.py
index 7a1338ab..1cd91b22 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -9,7 +9,6 @@
 import uuid
 import sys
 import pathlib
-import shutil
 
 from aiokafka.record.legacy_records import (
     LegacyRecordBatchBuilder, _LegacyRecordBatchBuilderPy)
@@ -117,8 +116,10 @@ def kafka_image():
 @pytest.fixture(scope='session')
 def ssl_folder(docker_ip_address, docker, kafka_image):
     ssl_dir = pathlib.Path('tests/ssl_cert')
-    if ssl_dir.exists():
-        shutil.rmtree(str(ssl_dir))
+    if ssl_dir.is_dir():
+        # Skip generating certificates when they already exist. Remove
+        # directory to re-generate them.
+        return ssl_dir
 
     ssl_dir.mkdir()