diff --git a/.fixtures.yml b/.fixtures.yml
index a939f70..1de700b 100644
--- a/.fixtures.yml
+++ b/.fixtures.yml
@@ -14,7 +14,6 @@ fixtures:
     "stdlib": "git://github.com/puppetlabs/puppetlabs-stdlib.git"
     "sysctl": "git://github.com/duritong/puppet-sysctl.git"
     'inifile':  'git://github.com/cprice-puppet/puppetlabs-inifile'
-    "create_resources": 'git://github.com/puppetlabs/puppetlabs-create_resources'
     'vswitch': 'git://github.com/ekarlso/puppet-vswitch'
   symlinks:
     "openstack": "#{source_dir}"
diff --git a/.gemfile b/.gemfile
deleted file mode 100644
index 9aad840..0000000
--- a/.gemfile
+++ /dev/null
@@ -1,5 +0,0 @@
-source :rubygems
-
-puppetversion = ENV.key?('PUPPET_VERSION') ? "= #{ENV['PUPPET_VERSION']}" : ['>= 2.7']
-gem 'puppet', puppetversion
-gem 'puppetlabs_spec_helper', '>= 0.1.0'
diff --git a/.travis.yml b/.travis.yml
index 20eb48f..337b1ff 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,18 +1,23 @@
-language: ruby
-rvm:
-  - 1.8.7
-before_script:
-after_script:
-script: "rake spec"
+script: "bundle exec rake spec SPEC_OPTS='--format documentation'"
 branches:
   only:
     - master
     - folsom
     - essex
+rvm:
+  - 1.8.7
+  - 1.9.3
+  - ruby-head
 env:
-  - PUPPET_VERSION=2.7.13
-  - PUPPET_VERSION=2.7.6
-  - PUPPET_VERSION=2.6.17
+  - PUPPET_GEM_VERSION="~> 2.7"
+  - PUPPET_GEM_VERSION="~> 3.0"
+matrix:
+  allow_failures:
+    - rvm: ruby-head
+  exclude:
+    - rvm: 1.9.3
+      env: PUPPET_GEM_VERSION="~> 2.7"
+    - rvm: ruby-head
+      env: PUPPET_GEM_VERSION="~> 2.7"
 notifications:
   email: false
-gemfile: .gemfile
diff --git a/Gemfile b/Gemfile
new file mode 100644
index 0000000..8e5e04d
--- /dev/null
+++ b/Gemfile
@@ -0,0 +1,13 @@
+source :rubygems
+
+group :development, :test do
+  gem 'puppetlabs_spec_helper', :require => false
+end
+
+if puppetversion = ENV['PUPPET_GEM_VERSION']
+  gem 'puppet', puppetversion, :require => false
+else
+  gem 'puppet', :require => false
+end
+
+# vim:ft=ruby