diff --git a/.travis.yml b/.travis.yml
index 43015f7..e0230ed 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,45 +1,42 @@
 ---
 sudo: false
 dist: trusty
 language: ruby
 cache: bundler
 before_install: >
   set -ex
   && bundle -v
   && rm -f Gemfile.lock
   && gem update --system
   && gem --version
   && bundle -v
 script:
   - 'bundle exec rake $CHECK'
 bundler_args: --without system_tests
 rvm:
-  - 2.4.1
+  - 2.5.1
 env:
   global:
-    - BEAKER_PUPPET_COLLECTION=puppet5 PUPPET_GEM_VERSION="~> 5.0"
+    - BEAKER_PUPPET_COLLECTION=puppet6 PUPPET_GEM_VERSION="~> 6.0"
 matrix:
   fast_finish: true
   include:
-    -
-      env: CHECK="syntax lint metadata_lint check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop"
-    -
-      env: CHECK=parallel_spec
-    -
-      env: PUPPET_GEM_VERSION="~> 4.0" CHECK=parallel_spec
-      rvm: 2.1.9
+    - env: CHECK="syntax lint metadata_lint check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop"
+    - env: CHECK=parallel_spec
+    - env: PUPPET_GEM_VERSION="~> 5.0" CHECK=parallel_spec
+      rvm: 2.4.1
 branches:
   only:
     - master
     - /^v\d/
 notifications:
   email: false
 deploy:
   provider: puppetforge
   user: puppet
   password:
     secure: ""
   on:
     tags: true
     all_branches: true
     condition: "$DEPLOY_TO_FORGE = yes"