diff --git a/lib/beaker-puppet/helpers/puppet_helpers.rb b/lib/beaker-puppet/helpers/puppet_helpers.rb
index 04b57936..bd28f974 100644
--- a/lib/beaker-puppet/helpers/puppet_helpers.rb
+++ b/lib/beaker-puppet/helpers/puppet_helpers.rb
@@ -872,7 +872,7 @@ def sign_certificate_for(host = [])
               else
                 on master, 'puppetserver ca sign --all', :acceptable_exit_codes => [0, 24]
                 out = on(master, 'puppetserver ca list --all').stdout
-                unless out =~ /.*Requested.*/
+                if out !~ /.*Requested.*/ && hostnames.all? { |hostname| out =~ /\b#{hostname}\b/ }
                   hostnames.clear
                   break
                 end