diff --git a/.msync.yml b/.msync.yml
index e6fe76b95..7c1b6e6ab 100644
--- a/.msync.yml
+++ b/.msync.yml
@@ -1 +1 @@
-modulesync_config_version: '0.13.1'
+modulesync_config_version: '0.13.3'
diff --git a/.rubocop.yml b/.rubocop.yml
index d6a394882..e1e0276b7 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -57,6 +57,9 @@ Style/AndOr:
 Style/RedundantSelf:
   Enabled: True
 
+Metric/BlockLength:
+  Enabled: False
+
 # Method length is not necessarily an indicator of code quality
 Metrics/MethodLength:
   Enabled: False
diff --git a/Gemfile b/Gemfile
index 0afeb6e02..6a4e56d97 100644
--- a/Gemfile
+++ b/Gemfile
@@ -25,10 +25,10 @@ group :test do
   gem 'metadata-json-lint',                                         :require => false
   gem 'puppet-blacksmith',                                          :require => false
   gem 'voxpupuli-release',                                          :require => false, :git => 'https://github.com/voxpupuli/voxpupuli-release-gem.git'
-  gem 'puppet-strings', '0.4.0',                                    :require => false
+  gem 'puppet-strings', '~> 0.99.0',                                :require => false
   gem 'rubocop-rspec', '~> 1.6',                                    :require => false if RUBY_VERSION >= '2.3.0'
   gem 'json_pure', '<= 2.0.1',                                      :require => false if RUBY_VERSION < '2.0.0'
-  gem 'mocha', '1.1.0',                                             :require => false
+  gem 'mocha', '>= 1.2.1',                                          :require => false
 end
 
 group :development do
@@ -46,6 +46,7 @@ group :system_tests do
   else
     gem 'beaker-rspec',  :require => false
   end
+  gem 'serverspec',                    :require => false
   gem 'beaker-puppet_install_helper',  :require => false
 end
 
diff --git a/Rakefile b/Rakefile
index 35ee06a8d..d00f2470a 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,7 +1,7 @@
 require 'puppetlabs_spec_helper/rake_tasks'
 require 'puppet_blacksmith/rake_tasks'
 require 'voxpupuli/release/rake_tasks'
-require 'puppet-strings/rake_tasks'
+require 'puppet-strings/tasks'
 
 PuppetLint.configuration.log_format = '%{path}:%{line}:%{check}:%{KIND}:%{message}'
 PuppetLint.configuration.fail_on_warnings = true