diff --git a/.ci/setup.sh b/.ci/setup.sh
index e6ddc587af..355fa72a20 100755
--- a/.ci/setup.sh
+++ b/.ci/setup.sh
@@ -4,30 +4,17 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 #
-
 set -e
 
 cidir=$(dirname "$0")
 source "${cidir}/lib.sh"
 
-#Note: If add clearlinux as supported CI use a stateless os-release file
-source /etc/os-release
-
-if [ "$ID" == fedora ];then
-	sudo -E dnf -y install automake yamllint coreutils moreutils bc make gcc
-elif [ "$ID" == centos ];then
-	sudo -E yum -y install epel-release
-	sudo -E yum -y install automake yamllint coreutils moreutils bc
-elif [ "$ID" == ubuntu ];then
-	sudo apt-get -qq update
-	sudo apt-get install -y -qq make automake qemu-utils python-pip coreutils moreutils bc
-	sudo pip install yamllint
-else
-	echo "Linux distribution not supported"
-fi
-
-
 clone_tests_repo
+
+pushd "${tests_repo_dir}"
+.ci/setup.sh
+popd
+
 bash "${cidir}/static-checks.sh"
 # yq needed to correctly parse runtime/versions.yaml
 make -C ${tests_repo_dir} install-yq
diff --git a/tests/test_images.sh b/tests/test_images.sh
index a8313b7e96..72b40c3066 100755
--- a/tests/test_images.sh
+++ b/tests/test_images.sh
@@ -275,7 +275,6 @@ setup()
 	[ ! -d "${tests_repo_dir}" ] && git clone "https://${tests_repo}" "${tests_repo_dir}"
 
 	if [ -z "${KATA_DEV_MODE:-}" ]; then
-		"${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