diff --git a/tests/test_images.sh b/tests/test_images.sh
index 3971ca8a7b..36100fca5b 100755
--- a/tests/test_images.sh
+++ b/tests/test_images.sh
@@ -251,8 +251,9 @@ 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
+		"${tests_repo_dir}/.ci/setup.sh"
+		mkdir -p /etc/kata-containers/
+		sudo cp -a /usr/share/defaults/kata-containers/configuration.toml /etc/kata-containers/configuration.toml
 	else
 		info "Running with KATA_DEV_MODE set, skipping installation of docker and kata packages"
 		# Make sure docker & kata are available