diff --git a/Gemfile b/Gemfile
index 9126e66..89d7137 100644
--- a/Gemfile
+++ b/Gemfile
@@ -12,7 +12,7 @@ gem 'voxpupuli-test', '~> 7.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.0', {"groups"=>["system_tests"]}
+gem 'voxpupuli-acceptance', '~> 3.4', {"groups"=>["system_tests"]}
 gem 'puppetlabs_spec_helper', {"groups"=>["system_tests"]}
 
 # vim:ft=ruby
diff --git a/metadata.json b/metadata.json
index edf1816..e217097 100644
--- a/metadata.json
+++ b/metadata.json
@@ -39,21 +39,18 @@
     {
       "operatingsystem": "CentOS",
       "operatingsystemrelease": [
-        "8",
         "9"
       ]
     },
     {
       "operatingsystem": "RedHat",
       "operatingsystemrelease": [
-        "8",
         "9"
       ]
     },
     {
       "operatingsystem": "AlmaLinux",
       "operatingsystemrelease": [
-        "8",
         "9"
       ]
     }
diff --git a/spec/support/acceptance/curl_command.rb b/spec/support/acceptance/curl_command.rb
deleted file mode 100644
index a487955..0000000
--- a/spec/support/acceptance/curl_command.rb
+++ /dev/null
@@ -1,64 +0,0 @@
-# https://github.com/mizzy/serverspec/pull/611 was rejected so adding it here.
-begin
-  require 'serverspec'
-
-  module Serverspec
-    module Type
-      class CurlCommand < Command
-        def response_code
-          m = /Response-Code: (?<code>\d+)/.match(stderr)
-          return 0 unless m
-          m[:code].to_i
-        end
-
-        def body
-          command_result.stdout
-        end
-
-        def body_as_json
-          MultiJson.load(body)
-        end
-
-        private
-
-        def curl_command
-          # curl on EL8 is too old to support --write-out %stderr
-          command = "/opt/puppetlabs/puppet/bin/curl --silent --write-out '%{stderr}Response-Code: %{response_code}\\n' '#{@name}'"
-
-          @options.each do |option, value|
-            case option
-            when :cacert, :cert, :key
-              command += " --#{option} '#{value}'"
-            when :headers
-              value.each do |header, header_value|
-                if header_value
-                  command += " --header '#{header}: #{header_value}'"
-                else
-                  command += " --header '#{header};'"
-                end
-              end
-            else
-              raise "Unknown option #{option} (value: #{value})"
-            end
-          end
-
-          command
-        end
-
-        def command_result
-          @command_result ||= @runner.run_command(curl_command)
-        end
-      end
-    end
-
-    module Helper
-      module Type
-        def curl_command(*args)
-          Serverspec::Type::CurlCommand.new(*args)
-        end
-      end
-    end
-  end
-rescue LoadError
-  # serverspec not present - usually in unit tests
-end