diff --git a/Gemfile b/Gemfile
index 85e8bfdd7c..3310257fb1 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,10 +3,10 @@
 source ENV['GEM_SOURCE'] || 'https://rubygems.org'
 
 group :test do
-  gem 'coveralls', require: false
-  gem 'puppet_metadata', '< 4.0', require: false
-  gem 'simplecov-console',         require: false
-  gem 'voxpupuli-test', '~> 8.1',  require: false
+  gem 'coveralls',                  require: false
+  gem 'puppet_metadata', '~> 4.0',  require: false
+  gem 'simplecov-console',          require: false
+  gem 'voxpupuli-test', '~> 9.0',   require: false
 
   gem 'puppet-lint-package_ensure-check', '~> 0.2.0',          require: false
   gem 'puppet-lint-resource_reference_syntax', '~> 2.0.0',     require: false
@@ -14,10 +14,9 @@ group :test do
   gem 'puppet-lint-unquoted_string-check', '~> 3.0.0',         require: false
   gem 'puppet-lint-variable_contains_upcase', '~> 2.0.0',      require: false
 
-  gem 'facterdb', '< 3', require: false # 3.0.0 drops support for EL7
-
-  gem 'r10k',    require: false
-  gem 'toml-rb', require: false # puppet/telegraf
+  gem 'librarian-puppet', require: false
+  gem 'r10k',             require: false
+  gem 'toml-rb',          require: false # puppet/telegraf
 end
 
 group :development do
@@ -30,16 +29,13 @@ group :system_tests do
 end
 
 group :release do
-  gem 'github_changelog_generator', '>= 1.16.1', require: false if RUBY_VERSION >= '2.5'
   gem 'voxpupuli-release', '~> 3.0', require: false
 end
 
-gem 'facter', ENV.fetch('FACTER_GEM_VERSION', nil), require: false, groups: [:test]
 gem 'rake', require: false
+gem 'facter', ENV.fetch('FACTER_GEM_VERSION', nil), require: false, groups: [:test]
 
-# See: https://github.com/puppetlabs/puppet/issues/9268
 puppetversion = ENV['PUPPET_GEM_VERSION'] || '~> 7.32'
 gem 'puppet', puppetversion, require: false, groups: [:test]
 
-gem 'librarian-puppet'
 # vim: syntax=ruby