diff --git a/.travis.yml b/.travis.yml
index 055535a7..c647f90a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,9 +1,19 @@
+language: ruby
+script: "bundle exec rake test COV=y SPEC_OPTS='--format n --color --backtrace'"
 rvm:
   - 1.8.7
   - 1.9.3
+  - 2.0.0
 env:
-  - PUPPET_GEM_VERSION=2.7.21
-  - PUPPET_GEM_VERSION=3.1.1
-  - PUPPET_GEM_VERSION=3.2.4
-  - PUPPET_GEM_VERSION=3.3.2
-  - PUPPET_GEM_VERSION=3.4.2
+  matrix:
+    - PUPPET_GEM_VERSION="~> 2.7.0"
+    - PUPPET_GEM_VERSION="~> 3.3.0"
+    - PUPPET_GEM_VERSION="~> 3.4.0"
+matrix:
+  exclude:
+    - rvm: 1.9.3
+      env: PUPPET_GEM_VERSION="~> 2.7.0"
+    - rvm: 2.0.0
+      env: PUPPET_GEM_VERSION="~> 2.7.0"
+notifications:
+  email: false