diff --git a/.travis.yml b/.travis.yml
index 79528a4..e888912 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,22 +1,33 @@
+---
 language: ruby
 rvm:
   - 1.8.7
   - 1.9.3
-script:
-  - "rake spec SPEC_OPTS='--format documentation'"
+  - 2.0.0
+script: "bundle exec rake spec SPEC_OPTS='--format documentation'"
+branches:
+  only:
+    master
 env:
-  - PUPPET_VERSION="~> 2.6.0"
-  - PUPPET_VERSION="~> 2.7.0"
-  - PUPPET_VERSION="~> 3.0.0"
-  - PUPPET_VERSION="~> 3.1.0"
+  matrix:
+    - PUPPET_GEM_VERSION="~> 2.7.0"
+    - PUPPET_GEM_VERSION="~> 3.0.0"
+    - PUPPET_GEM_VERSION="~> 3.1.0"
+    - PUPPET_GEM_VERSION="~> 3.2.0"
 matrix:
+  allow_failures:
+    # - rvm: ruby-head
   exclude:
+    - rvm: 1.8.7
+      env: PUPPET_GEM_VERSION="~> 2.7.0"
     - rvm: 1.9.3
-      env: PUPPET_VERSION="~> 2.6.0"
-      gemfile: .gemfile
-    - rvm: 1.9.3
-      env: PUPPET_VERSION="~> 2.7.0"
-      gemfile: .gemfile
+      env: PUPPET_GEM_VERSION="~> 2.7.0"
+    - rvm: 2.0.0
+      env: PUPPET_GEM_VERSION="~> 2.7.0"
+    - rvm: 2.0.0
+      env: PUPPET_GEM_VERSION="~> 3.0.0"
+    - rvm: 2.0.0
+      env: PUPPET_GEM_VERSION="~> 3.1.0"
 gemfile: .gemfile
 notifications:
   email: