diff --git a/.travis.yml b/.travis.yml
index cd7cec1..bb6ae94 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,39 +8,18 @@ bundler_args: --without development acceptance
 notifications:
   email: false
 
-rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1.0
-  - 2.3.1
-
-env:
-  matrix:
-    - PUPPET_GEM_VERSION="~> 3.7.0" CHECK=spec
-    - PUPPET_GEM_VERSION="~> 3.8.0" CHECK=spec
-    - PUPPET_GEM_VERSION="~> 3" CHECK=spec
-    - PUPPET_GEM_VERSION="~> 4.0.0" CHECK=spec
-    - PUPPET_GEM_VERSION="~> 4.1.0" CHECK=spec
-    - PUPPET_GEM_VERSION="~> 4.2.0" CHECK=spec
-    - PUPPET_GEM_VERSION="~> 4.3.0" CHECK=spec
-    - PUPPET_GEM_VERSION="~> 4.4.0" CHECK=spec
-    - PUPPET_GEM_VERSION="~> 4.5.0" CHECK=spec
-    - PUPPET_GEM_VERSION="~> 4.6.0" CHECK=spec
-    - PUPPET_GEM_VERSION="~> 4.7.0" CHECK=spec
-    - PUPPET_GEM_VERSION="~> 4.8.0" CHECK=spec
-    - PUPPET_GEM_VERSION="~> 4" CHECK=spec
-    - PUPPET_GEM_VERSION="~> 4" CHECK=rubocop
-
-script: 'SPEC_OPTS="--format documentation" bundle exec rake $CHECK'
-
 matrix:
   fast_finish: true
-  exclude:
-    - rvm: 1.9.3
-      env: PUPPET_GEM_VERSION="~> 4" CHECK=rubocop
-    - rvm: 2.3.1
-      env: PUPPET_GEM_VERSION="~> 3.7.0" CHECK=spec
-    - rvm: 2.3.1
-      env: PUPPET_GEM_VERSION="~> 3.8.0" CHECK=spec
-    - rvm: 2.3.1
-      env: PUPPET_GEM_VERSION="~> 3" CHECK=spec
+  include:
+  - rvm: 1.9.3
+    env: PUPPET_GEM_VERSION="~> 3" CHECK=spec
+  - rvm: 2.0.0
+    env: PUPPET_GEM_VERSION="~> 3" CHECK=spec
+  - rvm: 2.1.9
+    env: PUPPET_GEM_VERSION="~> 3" CHECK=spec
+  - rvm: 2.1.9
+    env: PUPPET_GEM_VERSION="~> 4" CHECK=spec
+  - rvm: 2.1.9
+    env: PUPPET_GEM_VERSION="~> 4" CHECK=rubocop
+
+script: 'SPEC_OPTS="--format documentation" bundle exec rake $CHECK'