diff --git a/.travis.yml b/.travis.yml
index 2ca02978..20f28b9b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,11 +26,13 @@ env:
     - PUPPET_GEM_VERSION="~> 4.4.0"
     - PUPPET_GEM_VERSION="~> 4.5.0"
     - PUPPET_GEM_VERSION="~> 4.6.0"
+    - PUPPET_GEM_VERSION="~> 4.7.0"
+    - PUPPET_GEM_VERSION="~> 4.8.0"
     - PUPPET_GEM_VERSION="~> 4"
 
 sudo: false
 
-script: 'bundle exec rake validate && bundle exec rake lint && SPEC_OPTS="--format documentation" bundle exec rake spec'
+script: 'SPEC_OPTS="--format documentation" bundle exec rake validate lint spec'
 
 matrix:
   fast_finish: true
@@ -59,6 +61,10 @@ matrix:
       env: PUPPET_GEM_VERSION="~> 4.5.0"
     - rvm: 1.8.7
       env: PUPPET_GEM_VERSION="~> 4.6.0"
+    - rvm: 1.8.7
+      env: PUPPET_GEM_VERSION="~> 4.7.0"
+    - rvm: 1.8.7
+      env: PUPPET_GEM_VERSION="~> 4.8.0"
     - rvm: 1.8.7
       env: PUPPET_GEM_VERSION="~> 4"
     - rvm: 2.3.1
diff --git a/Gemfile b/Gemfile
index 79bbac1e..57f5d738 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,4 +1,4 @@
-source 'https://rubygems.org'
+source ENV['GEM_SOURCE'] || 'https://rubygems.org'
 
 if puppetversion = ENV['PUPPET_GEM_VERSION']
   gem 'puppet', puppetversion, :require => false
@@ -6,11 +6,10 @@ else
   gem 'puppet', :require => false
 end
 
-gem 'metadata-json-lint'
 gem 'puppetlabs_spec_helper', '>= 1.2.0'
 gem 'facter', '>= 1.7.0'
 gem 'rspec-puppet'
-gem 'puppet-lint', '>= 1.0', '< 3.0'
+gem 'puppet-lint', '~> 2.0'
 gem 'puppet-lint-absolute_classname-check'
 gem 'puppet-lint-alias-check'
 gem 'puppet-lint-empty_string-check'
@@ -27,3 +26,5 @@ gem 'rspec',     '~> 2.0'   if RUBY_VERSION >= '1.8.7' and RUBY_VERSION < '1.9'
 gem 'rake',      '~> 10.0'  if RUBY_VERSION >= '1.8.7' and RUBY_VERSION < '1.9'
 gem 'json',      '<= 1.8'   if RUBY_VERSION < '2.0.0'
 gem 'json_pure', '<= 2.0.1' if RUBY_VERSION < '2.0.0'
+gem 'metadata-json-lint', '0.0.11'   if RUBY_VERSION < '1.9'
+gem 'metadata-json-lint'             if RUBY_VERSION >= '1.9'
diff --git a/Rakefile b/Rakefile
index 3c8d72ec..f2f04569 100644
--- a/Rakefile
+++ b/Rakefile
@@ -5,7 +5,7 @@ PuppetLint.configuration.send('disable_140chars')
 PuppetLint.configuration.relative = true
 PuppetLint.configuration.ignore_paths = ["spec/**/*.pp", "pkg/**/*.pp"]
 
-desc 'Run puppet in noop mode and check for syntax errors.'
+desc 'Validate manifests, templates, and ruby files'
 task :validate do
   Dir['manifests/**/*.pp'].each do |manifest|
     sh "puppet parser validate --noop #{manifest}"
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index ee4c2b35..74f727de 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -10,4 +10,7 @@
     Facter.clear
     Facter.clear_messages
   end
+  config.default_facts = {
+    :environment => 'rp_env',
+  }
 end