diff --git a/.gitignore b/.gitignore
index dd126f2..0cd25de 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,11 +1,12 @@
 #This file is generated by ModuleSync, do not edit.
 pkg/
 Gemfile.lock
 vendor/
-spec/fixtures/
+spec/fixtures/manifests/
+spec/fixtures/modules/
 .vagrant/
 .bundle/
 coverage/
 log/
 .idea/
 *.iml
diff --git a/.travis.yml b/.travis.yml
index 4e2c66d..f631db0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,35 +1,35 @@
 #This file is generated by ModuleSync, do not edit.
 ---
 sudo: false
 language: ruby
 cache: bundler
 script: "bundle exec rake validate lint spec"
 matrix:
   fast_finish: true
   include:
   - rvm: 2.1.6
     dist: trusty
     env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_set=docker/ubuntu-14.04
     script: bundle exec rake beaker
     services: docker
     sudo: required
   - rvm: 2.1.6
     dist: trusty
     env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_set=docker/centos-7
     script: bundle exec rake beaker
     services: docker
     sudo: required
-  - rvm: 2.1.6
+  - rvm: 2.1.9
     bundler_args: --without system_tests
     env: PUPPET_GEM_VERSION="~> 4.0" STRICT_VARIABLES="yes"
   - rvm: 2.1.5
     bundler_args: --without system_tests
     env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes"
   - rvm: 2.1.5
     bundler_args: --without system_tests
     env: PUPPET_GEM_VERSION="~> 3.0"
   - rvm: 1.9.3
     bundler_args: --without system_tests
     env: PUPPET_GEM_VERSION="~> 3.0"
 notifications:
   email: false
diff --git a/Gemfile b/Gemfile
index 9b5b214..c7da908 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,40 +1,41 @@
 #This file is generated by ModuleSync, do not edit.
 
 source ENV['GEM_SOURCE'] || "https://rubygems.org"
 
 def location_for(place, version = nil)
   if place =~ /^(git[:@][^#]*)#(.*)/
     [version, { :git => $1, :branch => $2, :require => false}].compact
   elsif place =~ /^file:\/\/(.*)/
     ['>= 0', { :path => File.expand_path($1), :require => false}]
   else
     [place, version, { :require => false}].compact
   end
 end
 
 group :development, :unit_tests do
-  gem 'json',                      :require => false
-  gem 'metadata-json-lint',        :require => false
-  gem 'puppet_facts',              :require => false
-  gem 'puppetlabs_spec_helper',    :require => false
-  gem 'rspec-puppet', '>= 2.3.2',  :require => false
-  gem 'simplecov',                 :require => false
-  gem 'puppet-blacksmith',         :require => false
-  gem 'rest-client', '~> 1.8.0',   :require => false
+  gem 'metadata-json-lint',             :require => false
+  gem 'puppet_facts',                   :require => false
+  gem 'puppet-blacksmith', '>= 3.4.0',  :require => false
+  gem 'puppetlabs_spec_helper',         :require => false
+  gem 'rspec-puppet', '>= 2.3.2',       :require => false
+  gem 'simplecov',                      :require => false
 end
 group :system_tests do
   gem 'beaker-rspec',                  *location_for(ENV['BEAKER_RSPEC_VERSION'] || '>= 3.4')
   gem 'beaker',                        *location_for(ENV['BEAKER_VERSION'])
   gem 'serverspec',                    :require => false
   gem 'beaker-puppet_install_helper',  :require => false
   gem 'master_manipulator',            :require => false
   gem 'beaker-hostgenerator',          *location_for(ENV['BEAKER_HOSTGENERATOR_VERSION'])
 end
 
+# json_pure 2.0.2 added a requirement on ruby >= 2. We pin to json_pure 2.0.1
+# if using ruby 1.x
+gem 'json_pure', '<=2.0.1', :require => false if RUBY_VERSION =~ /^1\./
+
 gem 'facter', *location_for(ENV['FACTER_GEM_VERSION'])
 gem 'puppet', *location_for(ENV['PUPPET_GEM_VERSION'])
 
-
 if File.exists? "#{__FILE__}.local"
   eval(File.read("#{__FILE__}.local"), binding)
 end