diff --git a/cookbooks/aws-parallelcluster-platform/kitchen.platform-install.yml b/cookbooks/aws-parallelcluster-platform/kitchen.platform-install.yml
index 9ebefc9dd2..8bc608fc58 100644
--- a/cookbooks/aws-parallelcluster-platform/kitchen.platform-install.yml
+++ b/cookbooks/aws-parallelcluster-platform/kitchen.platform-install.yml
@@ -308,4 +308,4 @@ suites:
       - recipe[aws-parallelcluster-platform::users]
     verifier:
       controls:
-        - /tag:install_users/
\ No newline at end of file
+        - /tag:install_users/
diff --git a/cookbooks/aws-parallelcluster-platform/test/controls/users_spec.rb b/cookbooks/aws-parallelcluster-platform/test/controls/users_spec.rb
index 4742b6ca02..a51e8a1775 100644
--- a/cookbooks/aws-parallelcluster-platform/test/controls/users_spec.rb
+++ b/cookbooks/aws-parallelcluster-platform/test/controls/users_spec.rb
@@ -18,6 +18,9 @@
   describe limits_conf("/etc/security/limits.d/00_all_limits.conf") do
     its('*') { should include ['-', 'nofile', "10000"] }
   end
+  describe bash("sudo -u #{user} bash -c 'ulimit -Sn'") do
+    its('stdout') { should cmp >= '8192' }
+  end
 end
 
 control 'tag:config_admin_user_and_group_correctly_defined' do
@@ -33,11 +36,3 @@
     its('gid') { should eq node['cluster']['cluster_admin_group_id'] }
   end
 end
-
-control 'tag:config_ulimit_is_not_lower_than_8192' do
-  only_if { !instance.custom_ami? }
-
-  describe bash("ulimit -Sn") do
-    its('stdout') { should cmp >= '8192' }
-  end
-end