diff --git a/.gemfile b/.gemfile
deleted file mode 100644
index 263d186..0000000
--- a/.gemfile
+++ /dev/null
@@ -1,16 +0,0 @@
-source 'https://rubygems.org'
-
-group :development, :test do
-  gem 'rake',                   :require => false
-  gem 'puppet-lint',            :require => false
-  gem 'rspec-puppet',           :require => false
-  gem 'puppetlabs_spec_helper', :require => false
-end
-
-if puppetversion = ENV['PUPPET_GEM_VERSION']
-  gem 'puppet', puppetversion, :require => false
-else
-  gem 'puppet', :require => false
-end
-
-gem 'hiera-puppet', :require => false
diff --git a/.travis.yml b/.travis.yml
index a43bfbc..e1bf238 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,34 +1,26 @@
 ---
 branches:
   only:
     - master
 language: ruby
+before_install: 'bundle install'
 bundler_args: --without development
 script: 'bundle exec rake validate && bundle exec rake lint && SPEC_OPTS="--format documentation" bundle exec rake spec'
-after_success:
-  - git clone -q git://github.com/puppetlabs/ghpublisher.git .forge-releng
-  - .forge-releng/publish
 rvm:
-  - 1.8.7
   - 1.9.3
+  - 2.0.0
+gemfile: Gemfile
 env:
   matrix:
     - PUPPET_GEM_VERSION="~> 2.7.0"
-    - PUPPET_GEM_VERSION="~> 3.1.0"
-    - PUPPET_GEM_VERSION="~> 3.2.0"
+    - PUPPET_GEM_VERSION="~> 3.0.0"
     - PUPPET_GEM_VERSION="~> 3.3.0"
-  global:
-  - PUBLISHER_LOGIN=saz
-  - secure: |-
-      Uo1E9umjUYnHYnI9rEanW1/HwQlMmAWiFQ22Dq4BpkMFZ8Fw/Qr3bB9QLGAFpWS0jNXOeMbU
-      dCdMDyzum547q8+ouAoOfm6cbJWU1UpnM/Z9ARFvPMreLhT4lhzYFv4lh3r3MiaeT0WF0Cc3
-      7eo8FsveTDufilOUZM2SQmnXi7w=
+    - PUPPET_GEM_VERSION="~> 3.7.1"
 matrix:
   include:
-    - rvm: 2.0.0
-      env: PUPPET_GEM_VERSION="~> 3.2.0"
+    - rvm: 1.9.3
+      env: PUPPET_GEM_VERSION="~> 2.7.0"
     - rvm: 2.0.0
       env: PUPPET_GEM_VERSION="~> 3.3.0"
 notifications:
   email: false
-gemfile: .gemfile
diff --git a/Gemfile b/Gemfile
new file mode 100644
index 0000000..96d57ce
--- /dev/null
+++ b/Gemfile
@@ -0,0 +1,14 @@
+source 'https://rubygems.org'
+puppetversion = ENV.key?('PUPPET_VERSION') ? "= #{ENV['PUPPET_VERSION']}" : ['>= 2.7']
+
+gem 'puppet', puppetversion
+
+group :development, :test do
+  gem 'puppet-blacksmith'
+  gem 'puppet-lint'
+  gem 'puppetlabs_spec_helper'
+  gem 'rake',                    '>=0.9.2.2'
+  gem 'rspec-puppet'
+end
+
+gem 'hiera-puppet', :require => false
diff --git a/Rakefile b/Rakefile
index 3cdd4b4..c35a345 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,2 +1,7 @@
 require 'puppetlabs_spec_helper/rake_tasks'
 require 'puppet_blacksmith/rake_tasks'
+require 'puppet-lint/tasks/puppet-lint'
+require 'rake'
+require 'rspec/core/rake_task'
+
+task :default => [:spec, :lint]