diff --git a/.travis.yml b/.travis.yml
index a9f0637..49e6cf0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,11 @@
-rvm: 1.9.3
+language: ruby
+rvm:
+  - 1.9.3
+  - 2.0.0
+  - 2.1.0
+gemfile:
+  - gemfiles/Gemfile.puppet-3.3.0
+  - gemfiles/Gemfile.puppet-3.4.0
 notifications:
   email:
     - 'inkblot@movealong.org'
-env:
-  - PUPPET_VERSION=3.3.0
-  - PUPPET_VERSION=3.4.0
diff --git a/Gemfile b/Gemfile
deleted file mode 100644
index 8e14922..0000000
--- a/Gemfile
+++ /dev/null
@@ -1,13 +0,0 @@
-source 'https://rubygems.org'
-
-if ENV.key?('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.3.0 b/gemfiles/Gemfile.puppet-3.3.0
new file mode 100644
index 0000000..cf22dc1
--- /dev/null
+++ b/gemfiles/Gemfile.puppet-3.3.0
@@ -0,0 +1,7 @@
+source 'https://rubygems.org'
+
+gem 'rake'
+gem 'puppet', '=3.3.0'
+gem 'puppet-lint'
+gem 'rspec-puppet'
+gem 'puppetlabs_spec_helper'
diff --git a/Gemfile.lock b/gemfiles/Gemfile.puppet-3.3.0.lock
similarity index 96%
rename from Gemfile.lock
rename to gemfiles/Gemfile.puppet-3.3.0.lock
index 53bc63b..1b3a4f4 100644
--- a/Gemfile.lock
+++ b/gemfiles/Gemfile.puppet-3.3.0.lock
@@ -9,7 +9,7 @@ GEM
     metaclass (0.0.4)
     mocha (1.1.0)
       metaclass (~> 0.0.1)
-    puppet (3.4.3)
+    puppet (3.3.0)
       facter (~> 1.6)
       hiera (~> 1.0)
       rgen (~> 0.6.5)
@@ -44,7 +44,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  puppet (~> 3.4.1)
+  puppet (= 3.3.0)
   puppet-lint
   puppetlabs_spec_helper
   rake
diff --git a/gemfiles/Gemfile.puppet-3.4.0 b/gemfiles/Gemfile.puppet-3.4.0
new file mode 100644
index 0000000..0a03adc
--- /dev/null
+++ b/gemfiles/Gemfile.puppet-3.4.0
@@ -0,0 +1,7 @@
+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.0.lock b/gemfiles/Gemfile.puppet-3.4.0.lock
new file mode 100644
index 0000000..d1202dc
--- /dev/null
+++ b/gemfiles/Gemfile.puppet-3.4.0.lock
@@ -0,0 +1,51 @@
+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