diff --git a/.gemfile b/.gemfile
index f1df3ee..84e8a31 100644
--- a/.gemfile
+++ b/.gemfile
@@ -1,22 +1,22 @@
 source ENV['GEM_SOURCE'] || "https://rubygems.org"
 
 if facterversion = ENV['FACTER_VERSION']
-  gem 'facter', facterversion,
+  gem 'facter', facterversion
 else
-  gem 'facter',
+  gem 'facter'
 end
 
 if puppetversion = ENV['PUPPET_VERSION']
-  gem 'puppet', puppetversion,
+  gem 'puppet', puppetversion
 else
-  gem 'puppet',
+  gem 'puppet'
 end
 
-gem 'rake',
-gem 'rspec-puppet',
-gem 'puppetlabs_spec_helper',
-gem 'puppet-lint',
-gem 'puppet_facts',
-gem 'metadata-json-lint',
-gem 'json',
-gem 'puppet-blacksmith',
+gem 'rake'
+gem 'rspec-puppet'
+gem 'puppetlabs_spec_helper'
+gem 'puppet-lint'
+gem 'puppet_facts'
+gem 'metadata-json-lint'
+gem 'json'
+gem 'puppet-blacksmith'
diff --git a/.travis.yml b/.travis.yml
index 7b538f4..ff6599a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,25 +1,19 @@
 ---
 language: ruby
 bundler_args: --without system_tests
-script: "bundle exec rake validate && bundle exec rake lint && bundle exec rake spec SPEC_OPTS='--format documentation'"
+script: "bundle exec rake release_checks"
 matrix:
   allow_failures:
   fast_finish: true
-  include:
-  - rvm: 2.1.8
-    env: PUPPET_VERSION="~> 3.0" FUTURE_PARSER="yes"
-    gemfile: .gemfile
-  - rvm: 2.1.8
-    env: PUPPET_VERSION="~> 3.0" STRICT_VARIABLES="yes"
-    gemfile: .gemfile
-  - rvm: 2.2.4
-    env: PUPPET_VERSION="~> 4.0" STRICT_VARIABLES="yes"
-    gemfile: .gemfile
-  - rvm: 2.3.0
-    env: PUPPET_VERSION="~> 4.0" STRICT_VARIABLES="yes"
-    gemfile: .gemfile
-  - rvm: 2.3.1
-    env: PUPPET_VERSION="~> 4.5" STRICT_VARIABLES="yes"
-    gemfile: .gemfile
+  rvm:
+    - 2.1.9
+    - 2.2.5
+    - 2.3.1
+  gemfile:
+    - .gemfile
+  env:
+    - PUPPET_VERSION="~> 3.0" FUTURE_PARSER="yes"
+    - PUPPET_VERSION="~> 3.0" STRICT_VARIABLES="yes"
+    - PUPPET_VERSION="~> 4.5" STRICT_VARIABLES="yes"
 notifications:
   email: false