diff --git a/tests/test_config.sh b/tests/test_config.sh
index 4e762744..357938d2 100644
--- a/tests/test_config.sh
+++ b/tests/test_config.sh
@@ -6,9 +6,8 @@
 # List of distros not to test, when running all tests with test_images.sh
 typeset -a skipWhenTestingAll
 
-if [ -n "${TRAVIS:-}" ]; then
-	# (travis may timeout with euleros, see:
-	#  https://github.com/kata-containers/osbuilder/issues/46)"
+if [ -n "${CI:-}" ]; then
+	# CI tests may timeout with euleros, see:
+	#  https://github.com/kata-containers/osbuilder/issues/46"
 	skipWhenTestingAll+=(euleros)
 fi
-
diff --git a/tests/test_images.sh b/tests/test_images.sh
index ceef790a..3971ca8a 100755
--- a/tests/test_images.sh
+++ b/tests/test_images.sh
@@ -251,6 +251,7 @@ setup()
 	[ ! -d "${tests_repo_dir}" ] && git clone "https://${tests_repo}" "${tests_repo_dir}"
 
 	if [ -z "${KATA_DEV_MODE:-}" ]; then
+		chronic $mgr remove-docker
 		chronic $mgr install-docker-system
 	else
 		info "Running with KATA_DEV_MODE set, skipping installation of docker and kata packages"