diff --git a/.travis.yml b/.travis.yml
index df53338..d5c0ce1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,49 +1,42 @@
 sudo: false
 language: ruby
 cache: bundler
 bundler_args: "--without system_tests development"
 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: 2.3.1
-    env: 
-      - PUPPET_VERSION=~> 5.0
-      - STRICT_VARIABLES=yes
-      - CHECK=test
+    env: PUPPET_VERSION="~> 4.0" STRICT_VARIABLES="yes" CHECK=test
   - rvm: 2.3.1
-    env: 
-      - PUPPET_VERSION=~> 5.0
-      - STRICT_VARIABLES=yes
-      - CHECK=rubocop
+    env: PUPPET_VERSION="~> 4.0" STRICT_VARIABLES="yes" CHECK=rubocop
+  - rvm: 2.3.1
+    env: PUPPET_VERSION="~> 4.0" STRICT_VARIABLES="yes" CHECK=build FORGEDEPLOY=true
+  - rvm: 2.3.1
+    env: PUPPET_VERSION="~> 5.0" STRICT_VARIABLES="yes" CHECK=test
+  - rvm: 2.3.1
+    env: PUPPET_VERSION="~> 5.0" STRICT_VARIABLES="yes" CHECK=rubocop
   - rvm: 2.5.3
-    env: 
-      - PUPPET_VERSION=~> 6.1
-      - STRICT_VARIABLES=yes
-      - CHECK=test
+    env: PUPPET_VERSION="~> 6.1" STRICT_VARIABLES="yes" CHECK=test
   - rvm: 2.5.3
-    env: 
-      - PUPPET_VERSION=~> 6.1
-      - STRICT_VARIABLES=yes
-      - CHECK=rubocop
-      - FORGEDEPLOY=true
+    env: PUPPET_VERSION="~> 6.1" STRICT_VARIABLES="yes" CHECK=rubocop
 notifications:
   email: false
 deploy:
   provider: puppetforge
   user: saz
   password:
     secure: VlSGdU3hHTPHYe+++BOrnVcZE8rFHEYtByHoymvbf++dZaGv1RgCYVGr2Vn33gaT/h4hho8rgRyep5F6sHJaDPZUprJ5WU3I/TnbQrm13C521Z2+PP5jhEjG9rMHze4+4vDVKdO8K9x0zErGDwHaf6+QF5lQH6ewIykLWXl0DRA=
   on:
     tags: true
     all_branches: true
     rvm: 2.3.1
     condition: "$FORGEDEPLOY = true"
diff --git a/Gemfile b/Gemfile
index 384187f..577f487 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,63 +1,63 @@
 source ENV['GEM_SOURCE'] || 'https://rubygems.org'
 
 def location_for(place, fake_version = nil)
   if place =~ /^(git[:@][^#]*)#(.*)/
     [fake_version, { git: $1, branch: $2, require: false }].compact
   elsif place =~ /^file:\/\/(.*)/
     ['>= 0', { path: File.expand_path($1), require: false }]
   else
     [place, { require: false }]
   end
 end
 
 group :test do
   gem 'puppetlabs_spec_helper', '>= 2.11.0',                        require: false
   gem 'rspec-puppet',                                               require: false
   gem 'rspec-puppet-facts',                                         require: false
   gem 'rspec-puppet-utils',                                         require: false
   gem 'puppet-lint-absolute_classname-check',                       require: false
   gem 'puppet-lint-leading_zero-check',                             require: false
   gem 'puppet-lint-trailing_comma-check',                           require: false
   gem 'puppet-lint-version_comparison-check',                       require: false
   gem 'puppet-lint-classes_and_types_beginning_with_digits-check',  require: false
   gem 'puppet-lint-unquoted_string-check',                          require: false
   gem 'puppet-lint-variable_contains_upcase',                       require: false
   gem 'metadata-json-lint',                                         require: false
   gem 'puppet-blacksmith',                                          require: false
   gem 'voxpupuli-release',                                          require: false, git: 'https://github.com/voxpupuli/voxpupuli-release-gem.git'
   gem 'puppet-strings', '~> 1.0',                                   require: false
   gem 'rubocop', '~> 0.49.1',                                       require: false
   gem 'rubocop-rspec',                                              require: false
   gem 'rspec-its',                                                  require: false
 end
 
 group :development do
   gem 'travis',       require: false
   gem 'travis-lint',  require: false
   gem 'guard-rake',   require: false
 end
 
 group :system_tests do
   if (beaker_version = ENV['BEAKER_VERSION'])
     gem 'beaker', *location_for(beaker_version)
   end
   if (beaker_rspec_version = ENV['BEAKER_RSPEC_VERSION'])
     gem 'beaker-rspec', *location_for(beaker_rspec_version)
   else
     gem 'beaker-rspec',  require: false
   end
   gem 'beaker-puppet_install_helper',  require: false
 end
 
 
 
 if (facterversion = ENV['FACTER_GEM_VERSION'])
   gem 'facter', facterversion.to_s, require: false, groups: [:test]
 else
   gem 'facter', require: false, groups: [:test]
 end
 
-ENV['PUPPET_VERSION'].nil? ? puppetversion = '~> 6.0' : puppetversion = ENV['PUPPET_VERSION'].to_s
+ENV['PUPPET_VERSION'].nil? ? puppetversion = '~> 4.0' : puppetversion = ENV['PUPPET_VERSION'].to_s
 gem 'puppet', puppetversion, require: false, groups: [:test]
 
 # vim: syntax=ruby