diff --git a/Gemfile b/Gemfile
index 2918dfec..898be012 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,29 +1,15 @@
 source ENV['GEM_SOURCE'] || "https://rubygems.org"
 
-group :development, :test do
-  gem 'metadata-json-lint',      :require => false
-  gem 'rspec-puppet',            :require => false
-  gem 'puppetlabs_spec_helper', '1.1.1'
-  gem 'puppet-lint',             :require => false
-  gem 'pry',                     :require => false
-  gem 'simplecov',               :require => false
-end
-
-# pin old versions for ruby 1.8.7
-if RUBY_VERSION >= '1.8.7' and RUBY_VERSION < '1.9'
-  gem 'rspec', '~> 2.0'
-  gem 'rake', '~> 10.0'
-else
-  gem 'rake', :require => false
+group :system_tests do
+  gem 'serverspec',              :require => false
+  gem 'beaker',                  :require => false
+  gem 'beaker-rspec',            :require => false
 end
 
-if RUBY_VERSION >= '1.8.7' and RUBY_VERSION < '2.0'
-  # json 2.x requires ruby 2.0. Lock to 1.8
-  gem 'json', '~> 1.8'
-  # json_pure 2.0.2 requires ruby 2.0. Lock to 2.0.1
-  gem 'json_pure', '= 2.0.1'
+if puppetversion = ENV['PUPPET_GEM_VERSION']
+  gem 'puppet', puppetversion, :require => false
 else
-  gem 'json'
+  gem 'puppet', :require => false
 end
 
 if facterversion = ENV['FACTER_GEM_VERSION']
@@ -32,16 +18,16 @@ else
   gem 'facter', :require => false
 end
 
-if puppetversion = ENV['PUPPET_GEM_VERSION']
-  gem 'puppet', puppetversion, :require => false
-else
-  gem 'puppet', :require => false
-end
+gem 'puppetlabs_spec_helper', '>= 1.2.0', :require => false
+gem 'rspec-puppet', :require => false
+gem 'puppet-lint', '~> 2.0', :require => false
+gem 'simplecov', :require => false
 
-group :system_tests do
-  gem 'serverspec',              :require => false
-  gem 'beaker',                  :require => false
-  gem 'beaker-rspec',            :require => false
-end
+gem 'rspec',     '~> 2.0', :require => false          if RUBY_VERSION >= '1.8.7' && RUBY_VERSION < '1.9'
+gem 'rake',      '~> 10.0', :require => false         if RUBY_VERSION >= '1.8.7' && RUBY_VERSION < '1.9'
+gem 'json',      '<= 1.8', :require => false          if RUBY_VERSION < '2.0.0'
+gem 'json_pure', '<= 2.0.1', :require => false        if RUBY_VERSION < '2.0.0'
+gem 'metadata-json-lint', '0.0.11', :require => false if RUBY_VERSION < '1.9'
+gem 'metadata-json-lint', :require => false           if RUBY_VERSION >= '1.9'
 
 # vim:ft=ruby