diff --git a/.gitignore b/.gitignore
index b5db85e..20d005b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ spec/fixtures/
 coverage/
 .idea/
 *.iml
+.settings/
diff --git a/.travis.yml b/.travis.yml
index 95552af..a6d066a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,15 +10,12 @@ matrix:
     env: PUPPET_GEM_VERSION="~> 3.0"
   - rvm: 1.9.3
     env: PUPPET_GEM_VERSION="~> 3.0"
-  - rvm: 1.9.3
-    env: PUPPET_GEM_VERSION="~> 3.4.0"
-  - rvm: 1.9.3
-    env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes"
-  - rvm: 2.1.5
+  - rvm: 2.0.0
     env: PUPPET_GEM_VERSION="~> 3.0"
-  - rvm: 2.1.5
-    env: PUPPET_GEM_VERSION="~> 3.4.0"
-  - rvm: 2.1.5
-    env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes"
+  - rvm: 2.1.6
+    env: PUPPET_GEM_VERSION="~> 4.0"
+  allow_failures:
+    - rvm: 2.1.6
+      env: PUPPET_GEM_VERSION="~> 4.0"
 notifications:
   email: false
diff --git a/Gemfile b/Gemfile
index d225639..9016155 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,20 +1,20 @@
 source ENV['GEM_SOURCE'] || 'https://rubygems.org'
 
 group :development, :unit_tests do
-  gem 'rake', '~> 10.1.0',       :require => false
-  gem 'rspec-core', '~> 3.1.0',  :require => false
-  gem 'rspec-puppet',            :require => false
+  gem 'rspec-core', '~> 3.1.7',  :require => false
+  gem 'rspec-puppet', '~> 2.1',  :require => false
   gem 'puppetlabs_spec_helper',  :require => false
-  gem 'puppet-lint', '< 1.1.0',  :require => false
-  gem 'metadata-json-lint',      :require => false
   gem 'simplecov',               :require => false
   gem 'puppet_facts',            :require => false
   gem 'json',                    :require => false
+  gem 'metadata-json-lint',      :require => false
+  gem 'puppet-lint', '< 1.1.0',  :require => false
 end
 
 group :system_tests do
-  gem 'beaker-rspec',  :require => false
-  gem 'serverspec',    :require => false
+  gem 'beaker-rspec',                  :require => false
+  gem 'serverspec',                    :require => false
+  gem 'beaker-puppet_install_helper',  :require => false
 end
 
 if facterversion = ENV['FACTER_GEM_VERSION']