diff --git a/.travis.yml b/.travis.yml
index a510c14..f2596b4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,37 +1,50 @@
----
-branches:
-  only:
-    - master
+sudo: false
 language: ruby
-before_install: 'bundle install'
+cache: bundler
 bundler_args: --without development
-script: 'bundle exec rake validate && bundle exec rake lint && SPEC_OPTS="--format documentation" bundle exec rake spec'
+before_install:
+- bundle -v
+- rm Gemfile.lock || true
+- gem update --system
+- gem update bundler
+- gem --version
+- bundle -v
+script:
+- bundle exec rake $CHECK
 matrix:
   fast_finish: true
   include:
   - rvm: 1.9.3
-    env: PUPPET_GEM_VERSION="~> 2.7.0" ORDERING="random"
+    env: PUPPET_VERSION="~> 3.0" STRICT_VARIABLES="yes" CHECK=test
   - rvm: 1.9.3
-    env: PUPPET_GEM_VERSION="~> 2.7.0" ORDERING="random"
-  - rvm: 1.9.3
-    env: PUPPET_GEM_VERSION="~> 3.3.0" ORDERING="random"
-  - rvm: 1.9.3
-    env: PUPPET_GEM_VERSION="~> 3.7.1" ORDERING="random"
-  - rvm: 2.0.0
-    env: PUPPET_GEM_VERSION="~> 2.7.0" ORDERING="random"
-  - rvm: 2.0.0
-    env: PUPPET_GEM_VERSION="~> 2.7.0" ORDERING="random"
-  - rvm: 2.0.0
-    env: PUPPET_GEM_VERSION="~> 3.3.0" ORDERING="random"
-  - rvm: 2.0.0
-    env: PUPPET_GEM_VERSION="~> 3.7.1" ORDERING="random"
-  - rvm: 2.1.8
-    env: PUPPET_GEM_VERSION="~> 4.4.1" STRICT_VARIABLES="yes" ORDERING="random"
+    env: PUPPET_VERSION="~> 3.0" STRICT_VARIABLES="yes" FUTURE_PARSER="yes" CHECK=test
+  - rvm: 2.1
+    env: PUPPET_VERSION="~> 3.0" STRICT_VARIABLES="yes" CHECK=test
+  - rvm: 2.1
+    env: PUPPET_VERSION="~> 4.0" STRICT_VARIABLES="yes" CHECK=test
+  - rvm: 2.2
+    env: PUPPET_VERSION="~> 4.0" STRICT_VARIABLES="yes" CHECK=test
+  - rvm: 2.3.1
+    env: PUPPET_VERSION="~> 4.0" STRICT_VARIABLES="yes" CHECK=build
+  - rvm: 2.3.1
+    env: PUPPET_VERSION="~> 4.0" STRICT_VARIABLES="yes" CHECK=rubocop
+  - rvm: 2.3.1
+    env: PUPPET_VERSION="~> 4.0" STRICT_VARIABLES="yes" CHECK=test FORGEDEPLOY=true
   - rvm: '2.1'
     sudo: required
     services: docker
     env: PUPPET_VERSION="3.8.4" BEAKER_set="centos-6-x64-docker"
     script: bundle exec rake acceptance
     bundler_args: --without development
 notifications:
   email: false
+deploy:
+  provider: puppetforge
+  user: saz
+  password:
+    secure: CDaPVIFvrP2qTlblGxDOvQWZ73swvhG+fU2jl9qEBjMCyKwz1obTGacOrUaj0CGSeim93k0V0FvpFirYtIsXt1B64WLZj/HNBPHHonsUZnb4ZVP1bYRtjkpPyhAes5JPbV+pXSiCMEzR9RwdP6BOpIYNgD953c2cW+bv4OGKvi4=
+  on:
+    tags: true
+    all_branches: true
+    rvm: 2.3.1
+    condition: "$FORGEDEPLOY = true"