diff --git a/spec/acceptance/suites/default/check_puppet_version_spec.rb b/spec/acceptance/suites/default/00_check_puppet_version_spec.rb
similarity index 100%
rename from spec/acceptance/suites/default/check_puppet_version_spec.rb
rename to spec/acceptance/suites/default/00_check_puppet_version_spec.rb
diff --git a/spec/acceptance/suites/default/fixture_modules_spec.rb b/spec/acceptance/suites/default/05_fixture_modules_spec.rb
similarity index 100%
rename from spec/acceptance/suites/default/fixture_modules_spec.rb
rename to spec/acceptance/suites/default/05_fixture_modules_spec.rb
diff --git a/spec/acceptance/suites/default/pki_tests_spec.rb b/spec/acceptance/suites/default/10_pki_tests_spec.rb
similarity index 100%
rename from spec/acceptance/suites/default/pki_tests_spec.rb
rename to spec/acceptance/suites/default/10_pki_tests_spec.rb
diff --git a/spec/acceptance/suites/default/set_hieradata_on_spec.rb b/spec/acceptance/suites/default/15_set_hieradata_on_spec.rb
similarity index 100%
rename from spec/acceptance/suites/default/set_hieradata_on_spec.rb
rename to spec/acceptance/suites/default/15_set_hieradata_on_spec.rb
diff --git a/spec/acceptance/suites/default/write_hieradata_to_spec.rb b/spec/acceptance/suites/default/20_write_hieradata_to_spec.rb
similarity index 100%
rename from spec/acceptance/suites/default/write_hieradata_to_spec.rb
rename to spec/acceptance/suites/default/20_write_hieradata_to_spec.rb
diff --git a/spec/acceptance/suites/default/enable_fips_spec.rb b/spec/acceptance/suites/default/25_enable_fips_spec.rb
similarity index 100%
rename from spec/acceptance/suites/default/enable_fips_spec.rb
rename to spec/acceptance/suites/default/25_enable_fips_spec.rb
diff --git a/spec/acceptance/suites/default/install_simp_deps_repo_spec.rb b/spec/acceptance/suites/default/99_install_simp_deps_repo_spec.rb
similarity index 96%
rename from spec/acceptance/suites/default/install_simp_deps_repo_spec.rb
rename to spec/acceptance/suites/default/99_install_simp_deps_repo_spec.rb
index 1b11caa..9990d47 100644
--- a/spec/acceptance/suites/default/install_simp_deps_repo_spec.rb
+++ b/spec/acceptance/suites/default/99_install_simp_deps_repo_spec.rb
@@ -2,7 +2,7 @@
 
 hosts.each do |host|
   expect_failures = false
-  if hosts_with_role(hosts, 'el8').include?(host)
+  if hosts_with_role(hosts, 'el9').include?(host)
     expect_failures = true
   end