diff --git a/.travis.yml b/.travis.yml
index 6c105a6..c261e74 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,12 +3,14 @@ rvm:
   - 1.9.3
   - 2.0.0
   - 2.1.1
-gemfile:
-  - gemfiles/Gemfile.puppet-3.3
-  - gemfiles/Gemfile.puppet-3.4
-  - gemfiles/Gemfile.puppet-3.5
-  - gemfiles/Gemfile.puppet-3.6
-  - gemfiles/Gemfile.puppet-3.7
+env:
+  - PUPPET_VERSION=3.3.0
+  - PUPPET_VERSION=3.4.0
+  - PUPPET_VERSION=3.5.0
+  - PUPPET_VERSION=3.6.0
+  - PUPPET_VERSION=3.7.0
+gemfile: Gemfile.travis
+before_install: 'cp Gemfile Gemfile.travis'
 notifications:
   email:
     - 'inkblot@movealong.org'
diff --git a/Gemfile b/Gemfile
new file mode 100644
index 0000000..5c6543b
--- /dev/null
+++ b/Gemfile
@@ -0,0 +1,13 @@
+source 'https://rubygems.org'
+
+if ENV.include?('PUPPET_VERSION')
+  puppetversion = "=#{ENV['PUPPET_VERSION']}"
+else
+  puppetversion = '3.4.1'
+end
+
+gem 'rake'
+gem 'puppet', puppetversion
+gem 'puppet-lint'
+gem 'rspec-puppet'
+gem 'puppetlabs_spec_helper'
diff --git a/gemfiles/Gemfile.puppet-3.5.lock b/Gemfile.lock
similarity index 96%
rename from gemfiles/Gemfile.puppet-3.5.lock
rename to Gemfile.lock
index d1202dc..f574c88 100644
--- a/gemfiles/Gemfile.puppet-3.5.lock
+++ b/Gemfile.lock
@@ -9,7 +9,7 @@ GEM
     metaclass (0.0.4)
     mocha (1.1.0)
       metaclass (~> 0.0.1)
-    puppet (3.4.0)
+    puppet (3.4.1)
       facter (~> 1.6)
       hiera (~> 1.0)
       rgen (~> 0.6.5)
@@ -44,7 +44,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  puppet (= 3.4.0)
+  puppet (= 3.4.1)
   puppet-lint
   puppetlabs_spec_helper
   rake
diff --git a/gemfiles/Gemfile.puppet-3.3 b/gemfiles/Gemfile.puppet-3.3
deleted file mode 100644
index cf22dc1..0000000
--- a/gemfiles/Gemfile.puppet-3.3
+++ /dev/null
@@ -1,7 +0,0 @@
-source 'https://rubygems.org'
-
-gem 'rake'
-gem 'puppet', '=3.3.0'
-gem 'puppet-lint'
-gem 'rspec-puppet'
-gem 'puppetlabs_spec_helper'
diff --git a/gemfiles/Gemfile.puppet-3.3.lock b/gemfiles/Gemfile.puppet-3.3.lock
deleted file mode 100644
index 1b3a4f4..0000000
--- a/gemfiles/Gemfile.puppet-3.3.lock
+++ /dev/null
@@ -1,51 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    diff-lcs (1.2.5)
-    facter (1.7.6)
-    hiera (1.3.4)
-      json_pure
-    json_pure (1.8.1)
-    metaclass (0.0.4)
-    mocha (1.1.0)
-      metaclass (~> 0.0.1)
-    puppet (3.3.0)
-      facter (~> 1.6)
-      hiera (~> 1.0)
-      rgen (~> 0.6.5)
-    puppet-lint (1.1.0)
-    puppet-syntax (1.3.0)
-      rake
-    puppetlabs_spec_helper (0.8.2)
-      mocha
-      puppet-lint
-      puppet-syntax
-      rake
-      rspec
-      rspec-puppet
-    rake (10.4.2)
-    rgen (0.6.6)
-    rspec (3.1.0)
-      rspec-core (~> 3.1.0)
-      rspec-expectations (~> 3.1.0)
-      rspec-mocks (~> 3.1.0)
-    rspec-core (3.1.7)
-      rspec-support (~> 3.1.0)
-    rspec-expectations (3.1.2)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.1.0)
-    rspec-mocks (3.1.3)
-      rspec-support (~> 3.1.0)
-    rspec-puppet (1.0.1)
-      rspec
-    rspec-support (3.1.2)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  puppet (= 3.3.0)
-  puppet-lint
-  puppetlabs_spec_helper
-  rake
-  rspec-puppet
diff --git a/gemfiles/Gemfile.puppet-3.4 b/gemfiles/Gemfile.puppet-3.4
deleted file mode 100644
index 0a03adc..0000000
--- a/gemfiles/Gemfile.puppet-3.4
+++ /dev/null
@@ -1,7 +0,0 @@
-source 'https://rubygems.org'
-
-gem 'rake'
-gem 'puppet', '=3.4.0'
-gem 'puppet-lint'
-gem 'rspec-puppet'
-gem 'puppetlabs_spec_helper'
diff --git a/gemfiles/Gemfile.puppet-3.4.lock b/gemfiles/Gemfile.puppet-3.4.lock
deleted file mode 100644
index d1202dc..0000000
--- a/gemfiles/Gemfile.puppet-3.4.lock
+++ /dev/null
@@ -1,51 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    diff-lcs (1.2.5)
-    facter (1.7.6)
-    hiera (1.3.4)
-      json_pure
-    json_pure (1.8.1)
-    metaclass (0.0.4)
-    mocha (1.1.0)
-      metaclass (~> 0.0.1)
-    puppet (3.4.0)
-      facter (~> 1.6)
-      hiera (~> 1.0)
-      rgen (~> 0.6.5)
-    puppet-lint (1.1.0)
-    puppet-syntax (1.3.0)
-      rake
-    puppetlabs_spec_helper (0.8.2)
-      mocha
-      puppet-lint
-      puppet-syntax
-      rake
-      rspec
-      rspec-puppet
-    rake (10.4.2)
-    rgen (0.6.6)
-    rspec (3.1.0)
-      rspec-core (~> 3.1.0)
-      rspec-expectations (~> 3.1.0)
-      rspec-mocks (~> 3.1.0)
-    rspec-core (3.1.7)
-      rspec-support (~> 3.1.0)
-    rspec-expectations (3.1.2)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.1.0)
-    rspec-mocks (3.1.3)
-      rspec-support (~> 3.1.0)
-    rspec-puppet (1.0.1)
-      rspec
-    rspec-support (3.1.2)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  puppet (= 3.4.0)
-  puppet-lint
-  puppetlabs_spec_helper
-  rake
-  rspec-puppet
diff --git a/gemfiles/Gemfile.puppet-3.5 b/gemfiles/Gemfile.puppet-3.5
deleted file mode 100644
index 0a03adc..0000000
--- a/gemfiles/Gemfile.puppet-3.5
+++ /dev/null
@@ -1,7 +0,0 @@
-source 'https://rubygems.org'
-
-gem 'rake'
-gem 'puppet', '=3.4.0'
-gem 'puppet-lint'
-gem 'rspec-puppet'
-gem 'puppetlabs_spec_helper'
diff --git a/gemfiles/Gemfile.puppet-3.6 b/gemfiles/Gemfile.puppet-3.6
deleted file mode 100644
index 0a03adc..0000000
--- a/gemfiles/Gemfile.puppet-3.6
+++ /dev/null
@@ -1,7 +0,0 @@
-source 'https://rubygems.org'
-
-gem 'rake'
-gem 'puppet', '=3.4.0'
-gem 'puppet-lint'
-gem 'rspec-puppet'
-gem 'puppetlabs_spec_helper'
diff --git a/gemfiles/Gemfile.puppet-3.6.lock b/gemfiles/Gemfile.puppet-3.6.lock
deleted file mode 100644
index d1202dc..0000000
--- a/gemfiles/Gemfile.puppet-3.6.lock
+++ /dev/null
@@ -1,51 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    diff-lcs (1.2.5)
-    facter (1.7.6)
-    hiera (1.3.4)
-      json_pure
-    json_pure (1.8.1)
-    metaclass (0.0.4)
-    mocha (1.1.0)
-      metaclass (~> 0.0.1)
-    puppet (3.4.0)
-      facter (~> 1.6)
-      hiera (~> 1.0)
-      rgen (~> 0.6.5)
-    puppet-lint (1.1.0)
-    puppet-syntax (1.3.0)
-      rake
-    puppetlabs_spec_helper (0.8.2)
-      mocha
-      puppet-lint
-      puppet-syntax
-      rake
-      rspec
-      rspec-puppet
-    rake (10.4.2)
-    rgen (0.6.6)
-    rspec (3.1.0)
-      rspec-core (~> 3.1.0)
-      rspec-expectations (~> 3.1.0)
-      rspec-mocks (~> 3.1.0)
-    rspec-core (3.1.7)
-      rspec-support (~> 3.1.0)
-    rspec-expectations (3.1.2)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.1.0)
-    rspec-mocks (3.1.3)
-      rspec-support (~> 3.1.0)
-    rspec-puppet (1.0.1)
-      rspec
-    rspec-support (3.1.2)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  puppet (= 3.4.0)
-  puppet-lint
-  puppetlabs_spec_helper
-  rake
-  rspec-puppet
diff --git a/gemfiles/Gemfile.puppet-3.7 b/gemfiles/Gemfile.puppet-3.7
deleted file mode 100644
index 0a03adc..0000000
--- a/gemfiles/Gemfile.puppet-3.7
+++ /dev/null
@@ -1,7 +0,0 @@
-source 'https://rubygems.org'
-
-gem 'rake'
-gem 'puppet', '=3.4.0'
-gem 'puppet-lint'
-gem 'rspec-puppet'
-gem 'puppetlabs_spec_helper'
diff --git a/gemfiles/Gemfile.puppet-3.7.lock b/gemfiles/Gemfile.puppet-3.7.lock
deleted file mode 100644
index d1202dc..0000000
--- a/gemfiles/Gemfile.puppet-3.7.lock
+++ /dev/null
@@ -1,51 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    diff-lcs (1.2.5)
-    facter (1.7.6)
-    hiera (1.3.4)
-      json_pure
-    json_pure (1.8.1)
-    metaclass (0.0.4)
-    mocha (1.1.0)
-      metaclass (~> 0.0.1)
-    puppet (3.4.0)
-      facter (~> 1.6)
-      hiera (~> 1.0)
-      rgen (~> 0.6.5)
-    puppet-lint (1.1.0)
-    puppet-syntax (1.3.0)
-      rake
-    puppetlabs_spec_helper (0.8.2)
-      mocha
-      puppet-lint
-      puppet-syntax
-      rake
-      rspec
-      rspec-puppet
-    rake (10.4.2)
-    rgen (0.6.6)
-    rspec (3.1.0)
-      rspec-core (~> 3.1.0)
-      rspec-expectations (~> 3.1.0)
-      rspec-mocks (~> 3.1.0)
-    rspec-core (3.1.7)
-      rspec-support (~> 3.1.0)
-    rspec-expectations (3.1.2)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.1.0)
-    rspec-mocks (3.1.3)
-      rspec-support (~> 3.1.0)
-    rspec-puppet (1.0.1)
-      rspec
-    rspec-support (3.1.2)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  puppet (= 3.4.0)
-  puppet-lint
-  puppetlabs_spec_helper
-  rake
-  rspec-puppet