diff --git a/spec/acceptance/06_postgresql_spec.rb b/spec/acceptance/06_postgresql_spec.rb
index c1574bcd92..9d37159e00 100644
--- a/spec/acceptance/06_postgresql_spec.rb
+++ b/spec/acceptance/06_postgresql_spec.rb
@@ -2,11 +2,6 @@
 
 describe 'postgresql datastore', if: RSpec.configuration.sensu_mode == 'full' do
   node = hosts_as('sensu-backend')[0]
-  before do
-    if ! RSpec.configuration.sensu_test_enterprise
-      skip("Skipping postgresql tests")
-    end
-  end
   context 'adds postgresql datastore' do
     it 'should work without errors and be idempotent' do
       pp = <<-EOS
diff --git a/spec/acceptance/99_facts_spec.rb b/spec/acceptance/99_facts_spec.rb
index 6a47315f5b..56a88ba286 100644
--- a/spec/acceptance/99_facts_spec.rb
+++ b/spec/acceptance/99_facts_spec.rb
@@ -24,12 +24,12 @@
 
     it "should have backend facts" do
       version = on(backend, 'facter -p sensu_backend.version').stdout
-      expect(version).to match(/^[0-9\.]+$/)
+      expect(version).to match(/^[0-9\.]+/)
     end
 
     it "should have sensuctl facts" do
       version = on(backend, 'facter -p sensuctl.version').stdout
-      expect(version).to match(/^[0-9\.]+$/)
+      expect(version).to match(/^[0-9\.]+/)
     end
   end
 
@@ -54,7 +54,7 @@
 
     it "should have agent facts" do
       version = on(agent, 'facter -p sensu_agent.version').stdout
-      expect(version).to match(/^[0-9\.]+$/)
+      expect(version).to match(/^[0-9\.]+/)
     end
   end
 end
diff --git a/spec/acceptance/sensu_ad_auth_spec.rb b/spec/acceptance/sensu_ad_auth_spec.rb
index 3d5719c814..1f6e095416 100644
--- a/spec/acceptance/sensu_ad_auth_spec.rb
+++ b/spec/acceptance/sensu_ad_auth_spec.rb
@@ -2,11 +2,6 @@
 
 describe 'sensu_ad_auth', if: RSpec.configuration.sensu_mode == 'types' do
   node = hosts_as('sensu-backend')[0]
-  before do
-    if ! RSpec.configuration.sensu_test_enterprise
-      skip("Skipping enterprise tests")
-    end
-  end
   context 'default' do
     it 'should work without errors' do
       pp = <<-EOS
diff --git a/spec/acceptance/sensu_ldap_auth_spec.rb b/spec/acceptance/sensu_ldap_auth_spec.rb
index 239fef6f02..3b23473afa 100644
--- a/spec/acceptance/sensu_ldap_auth_spec.rb
+++ b/spec/acceptance/sensu_ldap_auth_spec.rb
@@ -2,11 +2,6 @@
 
 describe 'sensu_ldap_auth', if: RSpec.configuration.sensu_mode == 'types' do
   node = hosts_as('sensu-backend')[0]
-  before do
-    if ! RSpec.configuration.sensu_test_enterprise
-      skip("Skipping enterprise tests")
-    end
-  end
   context 'default' do
     it 'should work without errors' do
       pp = <<-EOS
diff --git a/spec/acceptance/sensu_oidc_auth_spec.rb b/spec/acceptance/sensu_oidc_auth_spec.rb
index 7631c43e92..f619b78ba3 100644
--- a/spec/acceptance/sensu_oidc_auth_spec.rb
+++ b/spec/acceptance/sensu_oidc_auth_spec.rb
@@ -2,11 +2,6 @@
 
 describe 'sensu_oidc_auth', if: RSpec.configuration.sensu_mode == 'types' do
   node = hosts_as('sensu-backend')[0]
-  before do
-    if ! RSpec.configuration.sensu_test_enterprise
-      skip("Skipping enterprise tests")
-    end
-  end
   context 'default' do
     it 'should work without errors' do
       pp = <<-EOS
diff --git a/spec/acceptance/sensu_secrets_spec.rb b/spec/acceptance/sensu_secrets_spec.rb
index 92d1c966c0..f667c2911c 100644
--- a/spec/acceptance/sensu_secrets_spec.rb
+++ b/spec/acceptance/sensu_secrets_spec.rb
@@ -2,11 +2,6 @@
 
 describe 'sensu_secrets_vault_provider', if: RSpec.configuration.sensu_mode == 'types' do
   node = hosts_as('sensu-backend')[0]
-  before do
-    if ! RSpec.configuration.sensu_test_enterprise
-      skip("Skipping enterprise tests")
-    end
-  end
   context 'default' do
     it 'should work without errors' do
       pp = <<-EOS
diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
index ecc6e90b16..66ff2fd2fd 100644
--- a/spec/spec_helper_acceptance.rb
+++ b/spec/spec_helper_acceptance.rb
@@ -65,7 +65,7 @@
     if collection == 'puppet6'
       on setup_nodes, puppet('module', 'install', 'puppetlabs-yumrepo_core', '--version', '">= 1.0.1 < 2.0.0"'), { :acceptable_exit_codes => [0,1] }
     end
-    if RSpec.configuration.sensu_test_enterprise
+    if ['full','examples'].include?(RSpec.configuration.sensu_mode)
       on setup_nodes, puppet('module', 'install', 'puppetlabs-postgresql', '--version', '">= 6.0.0 < 7.0.0"'), { :acceptable_exit_codes => [0,1] }
     end
     # Dependencies only needed to test some examples