diff --git a/config_defaults.yml b/config_defaults.yml
index d0c3bd0..c1dec51 100644
--- a/config_defaults.yml
+++ b/config_defaults.yml
@@ -31,7 +31,7 @@ Gemfile:
       groups:
       - 'test'
   - gem: voxpupuli-test
-    version: '~> 1.4'
+    version: '~> 2.1'
   - gem: github_changelog_generator
     version: '>= 1.15.0'
     options:
diff --git a/moduleroot/.github/workflows/ci.yml.erb b/moduleroot/.github/workflows/ci.yml.erb
index aa8259e..3b6abbf 100644
--- a/moduleroot/.github/workflows/ci.yml.erb
+++ b/moduleroot/.github/workflows/ci.yml.erb
@@ -29,6 +29,8 @@ jobs:
         run: bundle exec rake validate
       - name: Run rake lint
         run: bundle exec rake lint
+      - name: Run rake validate
+        run: bundle exec rake rubocop
       - name: Setup Test Matrix
         id: get_outputs
         run: bundle exec metadata2gha --use-fqdn --pidfile-workaround <%= @configs['pidfile_workaround'] %>
diff --git a/moduleroot/.rubocop.yml.erb b/moduleroot/.rubocop.yml.erb
new file mode 100644
index 0000000..97fa6dd
--- /dev/null
+++ b/moduleroot/.rubocop.yml.erb
@@ -0,0 +1,8 @@
+inherit_gem:
+  voxpupuli-test: rubocop.yml
+
+Style/TrailingCommaInArguments:
+  EnforcedStyleForMultiline: consistent_comma
+
+Layout/DotPosition:
+  EnforcedStyle: leading
diff --git a/moduleroot/spec/spec_helper.rb.erb b/moduleroot/spec/spec_helper.rb.erb
index 524d2f1..452cc77 100644
--- a/moduleroot/spec/spec_helper.rb.erb
+++ b/moduleroot/spec/spec_helper.rb.erb
@@ -18,7 +18,7 @@ add_custom_fact :<%= fact['name'] %>, <%= fact['value'].inspect %> # <%= fact['s
 def get_content(subject, title)
   is_expected.to contain_file(title)
   content = subject.resource('file', title).send(:parameters)[:content]
-  content.split(/\n/).reject { |line| line =~ /(^#|^$|^\s+#)/ }
+  content.split("\n").reject { |line| line =~ %r{(^#|^$|^\s+#)} }
 end
 
 def verify_exact_contents(subject, title, expected_lines)
@@ -34,7 +34,7 @@ end
 def verify_concat_fragment_exact_contents(subject, title, expected_lines)
   is_expected.to contain_concat__fragment(title)
   content = subject.resource('concat::fragment', title).send(:parameters)[:content]
-  expect(content.split(/\n/).reject { |line| line =~ /(^#|^$|^\s+#)/ }).to match_array(expected_lines)
+  expect(content.split("\n").reject { |line| line =~ %r{(^#|^$|^\s+#)} }).to match_array(expected_lines)
 end
 
-Dir["./spec/support/**/*.rb"].sort.each { |f| require f }
+Dir['./spec/support/**/*.rb'].sort.each { |f| require f }
diff --git a/moduleroot/spec/spec_helper_acceptance.rb.erb b/moduleroot/spec/spec_helper_acceptance.rb.erb
index 5351a52..17923aa 100644
--- a/moduleroot/spec/spec_helper_acceptance.rb.erb
+++ b/moduleroot/spec/spec_helper_acceptance.rb.erb
@@ -14,4 +14,4 @@ configure_beaker(modules: :fixtures) do |host|
   end
 end
 
-Dir["./spec/support/acceptance/**/*.rb"].sort.each { |f| require f }
+Dir['./spec/support/acceptance/**/*.rb'].sort.each { |f| require f }