diff --git a/.gemfile b/.gemfile
index b17ef437b..306014445 100644
--- a/.gemfile
+++ b/.gemfile
@@ -1,16 +1,9 @@
 source 'https://rubygems.org'
 
+puppetversion = ENV.key?('PUPPET_VERSION') ? "= #{ENV['PUPPET_VERSION']}" : ['>= 3.3']
+gem 'puppet', puppetversion
 gem 'puppetlabs_spec_helper', '>= 0.1.0', :require => false
-
-if puppetversion = ENV['PUPPET_VERSION']
-  gem 'puppet', puppetversion, :require => false
-
-  if puppetversion[0].chr.to_i < 3
-    gem 'hiera-puppet', :require => false
-  end
-
-else
-  gem 'puppet', :require => false
-end
+gem 'puppet-lint', '>= 0.3.2'
+gem 'facter', '>= 1.7.0', "< 1.8.0"
 
 # vim:ft=ruby