diff --git a/cookbooks/aws-parallelcluster-platform/test/controls/arm_pl_spec.rb b/cookbooks/aws-parallelcluster-platform/test/controls/arm_pl_spec.rb
index 121e0b4cf8..36a8d35bc8 100644
--- a/cookbooks/aws-parallelcluster-platform/test/controls/arm_pl_spec.rb
+++ b/cookbooks/aws-parallelcluster-platform/test/controls/arm_pl_spec.rb
@@ -18,7 +18,7 @@
   gcc_major_minor_version = node['cluster']['armpl']['gcc']['major_minor_version']
 
   armpl_module_general_name = "armpl/#{armpl_version}"
-  armpl_module_name = "armpl/#{armpl_version}_gcc-#{gcc_major_minor_version}"
+  armpl_module_name = "armpl/#{armpl_version}.0_gcc-#{gcc_major_minor_version}"
   gcc_module_name = "armpl/gcc-#{gcc_major_minor_version}"
 
   if os_properties.ubuntu2204?
diff --git a/cookbooks/aws-parallelcluster-platform/test/controls/c_states_spec.rb b/cookbooks/aws-parallelcluster-platform/test/controls/c_states_spec.rb
index 519800f3ac..40f9309284 100644
--- a/cookbooks/aws-parallelcluster-platform/test/controls/c_states_spec.rb
+++ b/cookbooks/aws-parallelcluster-platform/test/controls/c_states_spec.rb
@@ -9,7 +9,7 @@
     its('content') { should match(/intel_idle.max_cstate=1/) }
   end
 
-  if os.redhat8? || os.alinux2? || os.centos7? || os.rocky8?
+  if os_properties.redhat8? || os_properties.alinux2? || os_properties.centos7? || os_properties.rocky8?
 
     describe file('/boot/grub2/grub.cfg') do
       it { should exist }
diff --git a/cookbooks/aws-parallelcluster-shared/test/controls/package_repos_spec.rb b/cookbooks/aws-parallelcluster-shared/test/controls/package_repos_spec.rb
index 899eb51785..4bc694003c 100644
--- a/cookbooks/aws-parallelcluster-shared/test/controls/package_repos_spec.rb
+++ b/cookbooks/aws-parallelcluster-shared/test/controls/package_repos_spec.rb
@@ -12,7 +12,7 @@
     end
 
     if os[:name] == 'redhat' && virtualization.system != 'docker'
-      describe yum.repo('codeready-builder-for-rhel-8-rhui-rpms') do
+      describe yum.repo("codeready-builder-for-rhel-#{os[:release].to_i}-rhui-rpms") do
         it { should exist }
         it { should be_enabled }
       end