diff --git a/test/system/setup_suite.bash b/test/system/setup_suite.bash
index a5c7da1..4df56ee 100644
--- a/test/system/setup_suite.bash
+++ b/test/system/setup_suite.bash
@@ -33,7 +33,6 @@ setup_suite() {
     return 1
   fi
 
-  local os_release="$(find_os_release)"
   local system_id="$(get_system_id)"
   local system_version="$(get_system_version)"
 
@@ -49,8 +48,7 @@ setup_suite() {
   _pull_and_cache_distro_image ubuntu 20.04 || false
   _pull_and_cache_distro_image busybox || false
   # If run on Fedora Rawhide, cache 2 extra images (previous Fedora versions)
-  local rawhide_res="$(awk '/rawhide/' $os_release)"
-  if [ "$system_id" = "fedora" ] && [ -n "$rawhide_res" ]; then
+  if is_fedora_rawhide; then
     _pull_and_cache_distro_image fedora "$((system_version-1))" || false
     _pull_and_cache_distro_image fedora "$((system_version-2))" || false
   fi