diff --git a/.msync.yml b/.msync.yml
index 11aed5fe6..e8e870383 100644
--- a/.msync.yml
+++ b/.msync.yml
@@ -1 +1 @@
-modulesync_config_version: '2.10.0'
+modulesync_config_version: '2.10.1'
diff --git a/.sync.yml b/.sync.yml
index 2a45cb514..afda1f5af 100644
--- a/.sync.yml
+++ b/.sync.yml
@@ -8,6 +8,7 @@
     - set: ubuntu1804-64
     - set: centos6-64
     - set: centos7-64
+    - set: centos8-64
 appveyor.yml:
   delete: true
 spec/spec_helper.rb:
diff --git a/.travis.yml b/.travis.yml
index 2d4b17757..187d001ae 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -70,6 +70,14 @@ matrix:
     bundler_args: --without development release
     env: PUPPET_INSTALL_TYPE=agent BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_debug=true BEAKER_setfile=centos7-64 BEAKER_HYPERVISOR=docker CHECK=beaker
     services: docker
+  - rvm: 2.5.3
+    bundler_args: --without development release
+    env: PUPPET_INSTALL_TYPE=agent BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_debug=true BEAKER_setfile=centos8-64 BEAKER_HYPERVISOR=docker CHECK=beaker
+    services: docker
+  - rvm: 2.5.3
+    bundler_args: --without development release
+    env: PUPPET_INSTALL_TYPE=agent BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_debug=true BEAKER_setfile=centos8-64 BEAKER_HYPERVISOR=docker CHECK=beaker
+    services: docker
 branches:
   only:
   - master
diff --git a/metadata.json b/metadata.json
index 11e5118f3..1057602e4 100644
--- a/metadata.json
+++ b/metadata.json
@@ -12,14 +12,16 @@
       "operatingsystem": "RedHat",
       "operatingsystemrelease": [
         "6",
-        "7"
+        "7",
+        "8"
       ]
     },
     {
       "operatingsystem": "CentOS",
       "operatingsystemrelease": [
         "6",
-        "7"
+        "7",
+        "8"
       ]
     },
     {
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index b520ebd63..00bc4ecea 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -48,10 +48,14 @@
   # Otherwise we need to match the correct facter version to the used puppet version.
   # as of 2019-10-31, puppet 5 ships facter 3.11 and puppet 6 ships facter 3.14
   # https://puppet.com/docs/puppet/5.5/about_agent.html
+  #
+  # The environment variable `PUPPET_VERSION` is available in our travis environment, but we cannot rely on it
+  # if somebody runs the tests locally. For that case we should fallback the the puppet gem version.
   c.default_facter_version = if ENV['FACTERDB_FACTS_VERSION']
                                ENV['FACTERDB_FACTS_VERSION']
                              else
-                               Gem::Dependency.new('', ENV['PUPPET_VERSION']).match?('', '5') ? '3.11.0' : '3.14.0'
+                               puppet_version = ENV['PUPPET_VERSION'] ? ENV['PUPPET_VERSION'] : Gem.loaded_specs['puppet'].version.to_s
+                               Gem::Dependency.new('', puppet_version).match?('', '5') ? '3.11.0' : '3.14.0'
                              end
 
   # Coverage generation