diff --git a/.msync.yml b/.msync.yml
index 89e1807..4abde22 100644
--- a/.msync.yml
+++ b/.msync.yml
@@ -1 +1 @@
-modulesync_config_version: '0.21.1'
+modulesync_config_version: '0.21.3'
diff --git a/.rspec_parallel b/.rspec_parallel
new file mode 100644
index 0000000..e4d136b
--- /dev/null
+++ b/.rspec_parallel
@@ -0,0 +1 @@
+--format progress
diff --git a/.rubocop.yml b/.rubocop.yml
index 6c9347f..d92e4e4 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -503,6 +503,10 @@ Style/ClosingParenthesisIndentation:
 
 # RSpec
 
+RSpec/BeforeAfterAll:
+  Exclude:
+    - spec/acceptance/**/*
+
 # We don't use rspec in this way
 RSpec/DescribeClass:
   Enabled: False
@@ -522,6 +526,10 @@ RSpec/RepeatedDescription:
 RSpec/NestedGroups:
   Enabled: False
 
+# this is broken on ruby1.9
+Style/IndentHeredoc:
+  Enabled: False
+
 # disable Yaml safe_load. This is needed to support ruby2.0.0 development envs
 Security/YAMLLoad:
   Enabled: false
diff --git a/Gemfile b/Gemfile
index d35336c..0914f7c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -35,6 +35,7 @@ group :test do
   gem 'github_changelog_generator', '~> 1.13.0',                    :require => false if RUBY_VERSION < '2.2.2'
   gem 'rack', '~> 1.0',                                             :require => false if RUBY_VERSION < '2.2.2'
   gem 'github_changelog_generator',                                 :require => false if RUBY_VERSION >= '2.2.2'
+  gem 'parallel_tests',                                             :require => false
 end
 
 group :development do
diff --git a/metadata.json b/metadata.json
index 3ed338d..a9d6e98 100644
--- a/metadata.json
+++ b/metadata.json
@@ -40,7 +40,7 @@
   "requirements": [
     {
       "name": "puppet",
-      "version_requirement": ">= 4.6.1 < 5.0.0"
+      "version_requirement": ">= 4.7.0 < 5.0.0"
     }
   ],
   "dependencies": [
diff --git a/spec/acceptance/nodesets/archlinux-2-x64.yml b/spec/acceptance/nodesets/archlinux-2-x64.yml
new file mode 100644
index 0000000..89b6300
--- /dev/null
+++ b/spec/acceptance/nodesets/archlinux-2-x64.yml
@@ -0,0 +1,13 @@
+---
+# This file is managed via modulesync
+# https://github.com/voxpupuli/modulesync
+# https://github.com/voxpupuli/modulesync_config
+HOSTS:
+  archlinux-2-x64:
+    roles:
+      - master
+    platform: archlinux-2-x64
+    box: archlinux/archlinux
+    hypervisor: vagrant
+CONFIG:
+  type: foss