diff --git a/spec/support/acceptance/puppetserver.rb b/spec/support/acceptance/puppetserver.rb
index 007402da3..c2f7fe2a1 100644
--- a/spec/support/acceptance/puppetserver.rb
+++ b/spec/support/acceptance/puppetserver.rb
@@ -1,4 +1,10 @@
 def unsupported_puppetserver
-  host_inventory['facter']['os']['name'] == 'Fedora' ||
-    (host_inventory['facter']['os']['name'] == 'Ubuntu' && host_inventory['facter']['os']['distro']['codename'] == 'focal')
+  case host_inventory['facter']['os']['name']
+  when 'Fedora'
+    true
+  when 'Debian'
+    ENV['BEAKER_PUPPET_COLLECTION'] == 'puppet5' && host_inventory['facter']['os']['distro']['codename'] == 'buster'
+  when 'Ubuntu'
+    ENV['BEAKER_PUPPET_COLLECTION'] == 'puppet6' && host_inventory['facter']['os']['distro']['codename'] == 'focal'
+  end
 end