diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index c5bac71..f2d81d4 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,5 +1,4 @@
 # DO NOT EDIT THIS FILE!
 # This file is managed by ModuleSync.
 
-* @opus-codium/core
-* @opus-codium/vittoria-conseil
+* @opus-codium/core @opus-codium/vittoria-conseil
diff --git a/Gemfile b/Gemfile
index 98a04cf..db21d3b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -4,7 +4,7 @@
 source ENV['GEM_SOURCE'] || 'https://rubygems.org'
 
 group :test do
-  gem 'voxpupuli-test', '~> 6.0',   :require => false
+  gem 'voxpupuli-test', '~> 7.0',   :require => false
   gem 'coveralls',                  :require => false
   gem 'simplecov-console',          :require => false
   gem 'puppet_metadata', '~> 3.0',  :require => false
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 6515b7b..9efb4ae 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -17,3 +17,4 @@
     add_custom_fact name.to_sym, value
   end
 end
+Dir['./spec/support/spec/**/*.rb'].sort.each { |f| require f }