diff --git a/.travis.yml b/.travis.yml
index 34bdd7d6..e3214dcb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,31 +5,18 @@ branches:
 language: ruby
 bundler_args: --without development
 script: 'bundle exec rake validate && bundle exec rake lint && SPEC_OPTS="--format documentation" bundle exec rake spec'
-rvm:
-  - 1.8.7
-  - 1.9.3
-  - 2.0.0
-env:
-  matrix:
-    - PUPPET_GEM_VERSION="~> 2.7.0"
-    - PUPPET_GEM_VERSION="~> 3.1.0"
-    - PUPPET_GEM_VERSION="~> 3.2.0"
-    - PUPPET_GEM_VERSION="~> 3.3.0"
-    - PUPPET_GEM_VERSION="~> 3.4.0"
-    - PUPPET_GEM_VERSION="~> 3.5.1"
-    - PUPPET_GEM_VERSION="~> 3.6.0"
-    - PUPPET_GEM_VERSION="~> 3.7.0"
-  global:
 matrix:
   fast_finish: true
-  exclude:
-    - rvm: 1.9.3
-      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.1.0"
+  include:
     - rvm: 1.8.7
-      env: PUPPET_GEM_VERSION="~> 3.2.0"
+      env: PUPPET_GEM_VERSION="~> 3.0"
+    - rvm: 1.9.3
+      env: PUPPET_GEM_VERSION="~> 3.0"
+    - rvm: 2.1.5
+      env: PUPPET_GEM_VERSION="~> 3.0"
+    - rvm: 2.1.5
+      env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes"
+    - rvm: 2.1.6
+      env: PUPPET_GEM_VERSION="~> 4.0" STRICT_VARIABLES="yes"
 notifications:
   email: false