diff --git a/.fixtures.yml b/.fixtures.yml
index d76bdb8..70675ce 100644
--- a/.fixtures.yml
+++ b/.fixtures.yml
@@ -1,4 +1,7 @@
 fixtures:
   repositories:
     stdlib: "https://github.com/puppetlabs/puppetlabs-stdlib"
-    concat: "https://github.com/puppetlabs/puppetlabs-concat"
\ No newline at end of file
+    concat: "https://github.com/puppetlabs/puppetlabs-concat"
+    sshkeys_core:
+      repo: "https://github.com/puppetlabs/puppetlabs-sshkeys_core"
+      puppet_version: ">= 6.0.0"
diff --git a/.travis.yml b/.travis.yml
index 7df8998..a9722d4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,38 +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="~> 4.0" STRICT_VARIABLES="yes" CHECK=test
   - 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=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
+  - rvm: 2.5.3
+    env: PUPPET_VERSION="~> 6.1" STRICT_VARIABLES="yes" CHECK=rubocop
 notifications:
   email: false
 deploy:
   provider: puppetforge
   user: saz
   password:
     secure: HOEacsz4i4p5Bagrotnyrst0TPMsbqlpfK8X2j/7ieGRqTJPuLx2yarz2ILHsEUnVPqlSJd4mDXabMZbPcpJlD/tJfNeoU1nVGUH+RX1BcXpakDeZrkraImDLjpnuw3ANtGgUpCFJlQLbYylHBA84RH/mZuroNhW5zi0polPz5M=
   on:
     tags: true
     all_branches: true
     rvm: 2.3.1
     condition: "$FORGEDEPLOY = true"