diff --git a/.rspec b/.rspec
new file mode 100644
index 0000000..8cf94aa
--- /dev/null
+++ b/.rspec
@@ -0,0 +1,4 @@
+--format documentation
+--color
+
+
diff --git a/.travis.yml b/.travis.yml
index 9ad0b9a..4d340f1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,12 +1,19 @@
+---
 language: ruby
-rvm:
-  - 2.0.0
-  - 2.1.0
+sudo: false
+bundler_args: --without development system_tests
+before_install: rm Gemfile.lock || true
+script: bundle exec rake test
 env:
-  - PUPPET_VERSION=4.0.0
-  - PUPPET_VERSION=4.5.0
-gemfile: Gemfile.travis
-before_install: 'cp Gemfile Gemfile.travis'
-notifications:
-  email:
-    - 'inkblot@movealong.org'
+  - PUPPET_GEM_VERSION="~> 4.0.0"
+  - PUPPET_GEM_VERSION="~> 4.5.0"
+  - PUPPET_GEM_VERSION="~> 4.9.0"
+rvm:
+  - 2.2
+matrix:
+  exclude:
+    - rvm: 2.2
+      env: PUPPET_GEM_VERSION="~> 3.7.0"
+    - rvm: 2.2
+      env: PUPPET_GEM_VERSION="~> 3.8.0"
+  fast_finish: false
diff --git a/Gemfile.lock b/Gemfile.lock
deleted file mode 100644
index b95d779..0000000
--- a/Gemfile.lock
+++ /dev/null
@@ -1,57 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    CFPropertyList (2.2.8)
-    diff-lcs (1.2.5)
-    facter (2.4.6)
-      CFPropertyList (~> 2.2.6)
-    hiera (3.2.1)
-    json_pure (2.0.2)
-    metaclass (0.0.4)
-    metadata-json-lint (0.0.2)
-    mocha (1.1.0)
-      metaclass (~> 0.0.1)
-    puppet (4.5.3)
-      CFPropertyList (~> 2.2.6)
-      facter (> 2.0, < 4)
-      hiera (>= 2.0, < 4)
-      json_pure
-    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)
-    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
-  metadata-json-lint
-  puppet (~> 4.5.0)
-  puppet-lint
-  puppetlabs_spec_helper
-  rake
-  rspec-puppet
-
-BUNDLED WITH
-   1.13.5