diff --git a/.fixtures.yml b/.fixtures.yml
index 571994bd9..0dbf6e6a8 100644
--- a/.fixtures.yml
+++ b/.fixtures.yml
@@ -6,7 +6,9 @@ fixtures:
     concat: 'https://github.com/puppetlabs/puppetlabs-concat'
     cron_core: 'https://github.com/puppetlabs/puppetlabs-cron_core'
     extlib: 'https://github.com/voxpupuli/puppet-extlib'
-    postgresql: 'https://github.com/puppetlabs/puppetlabs-postgresql'
+    postgresql:
+      repo: 'https://github.com/bastelfreak/puppetlabs-postgresql'
+      branch: 'active'
     puppet: 'https://github.com/theforeman/puppet-puppet'
     redis: 'https://github.com/voxpupuli/puppet-redis'
     systemd: 'https://github.com/voxpupuli/puppet-systemd'
diff --git a/Gemfile b/Gemfile
index 0f92b7879..fbf9af457 100644
--- a/Gemfile
+++ b/Gemfile
@@ -12,7 +12,7 @@ gem 'voxpupuli-test', '~> 9.0', {"groups"=>["test"]}
 gem 'github_changelog_generator', '>= 1.15.0', {"groups"=>["development"]}
 gem 'puppet_metadata', '~> 4.0'
 gem 'puppet-blacksmith', '>= 6.0.0', {"groups"=>["development"]}
-gem 'voxpupuli-acceptance', '~> 3.4', {"groups"=>["system_tests"]}
+gem 'voxpupuli-acceptance', '~> 4.2', {"groups"=>["system_tests"]}
 gem 'puppetlabs_spec_helper', {"groups"=>["system_tests"]}
 gem 'webmock', '~> 2.0'
 gem 'oauth'
diff --git a/spec/acceptance/foreman_hdm_spec.rb b/spec/acceptance/foreman_hdm_spec.rb
index d6f1e9068..e3260afbf 100644
--- a/spec/acceptance/foreman_hdm_spec.rb
+++ b/spec/acceptance/foreman_hdm_spec.rb
@@ -13,7 +13,7 @@
   end
 
   it_behaves_like 'the foreman application'
-    describe curl_command("https://admin:changeme@#{host_inventory['fqdn']}/api/plugins", cacert: '/etc/foreman-certs/certificate.pem') do
+  describe curl_command("https://#{host_inventory['fqdn']}/api/plugins", cacert: '/etc/foreman-certs/certificate.pem', user: 'admin:changeme') do
     its(:stdout) { should include('foreman_hdm') }
     its(:exit_status) { should eq 0 }
   end
diff --git a/spec/acceptance/foreman_openbolt_spec.rb b/spec/acceptance/foreman_openbolt_spec.rb
index 72285ffc4..be9a9771b 100644
--- a/spec/acceptance/foreman_openbolt_spec.rb
+++ b/spec/acceptance/foreman_openbolt_spec.rb
@@ -14,7 +14,7 @@
 
   it_behaves_like 'the foreman application'
 
-  describe curl_command("https://admin:changeme@#{host_inventory['fqdn']}/api/plugins", cacert: '/etc/foreman-certs/certificate.pem') do
+  describe curl_command("https://#{host_inventory['fqdn']}/api/plugins", cacert: '/etc/foreman-certs/certificate.pem', user: 'admin:changeme') do
     its(:stdout) { should include('foreman_openbolt') }
     its(:exit_status) { should eq 0 }
   end