diff --git a/.fixtures.yml b/.fixtures.yml
index db9fda7..49470b6 100644
--- a/.fixtures.yml
+++ b/.fixtures.yml
@@ -28,6 +28,7 @@ fixtures:
       repo: https://github.com/simp/pupmod-simp-stunnel
     systemd:
       repo: https://github.com/simp/puppet-systemd
+      branch: simp-master
     tcpwrappers:
       repo: https://github.com/simp/pupmod-simp-tcpwrappers
   symlinks:
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 14fb9a5..ab33eed 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -111,6 +111,14 @@ cache:
 # starting with 2016.4.5.
 #
 
+.pe_2016_4: &pe_2016_4
+  variables:
+    PUPPET_VERSION: '~> 4.7.0'
+
+.simp_6_0: &simp_6_0
+  variables:
+    PUPPET_VERSION: '~> 4.8.1'
+
 .simp_6_1: &simp_6_1
   variables:
     PUPPET_VERSION: '~> 4.10.8'
@@ -177,6 +185,20 @@ pup5_latest-lint:
 # Unit Test Matrix
 #
 
+# ----------------------------------------------------------------------
+# Puppet 4.7 for early releases of PE 2016.4 LTS
+pup4_7-unit:
+  <<: *unit_base
+  <<: *pe_2016_4
+  image: 'ruby:2.1'
+
+# ----------------------------------------------------------------------
+# Puppet 4.8 for SIMP 6 and PE 2016.5
+pup4_8-unit:
+  <<: *unit_base
+  <<: *simp_6_0
+  image: 'ruby:2.1'
+
 # ----------------------------------------------------------------------
 # Puppet 4.10 for SIMP 6.1, PE 2016.4 LTS, and 2017.2
 pup4_10-unit:
@@ -214,6 +236,22 @@ pup5_latest-unit:
 # test matrix is even more limited.  Here we stick to versions supported
 # by non-EOL meta-releases of SIMP and LTS versions of Puppet Enterprise.
 
+# ----------------------------------------------------------------------
+# Puppet 4.8 for SIMP 6.0 and PE 2016.5
+el-pup4_8:
+  <<: *acceptance_base
+  <<: *simp_6_0
+  script:
+    - 'bundle exec rake beaker:suites'
+
+el-pup4_8-fips:
+  <<: *acceptance_base
+  <<: *simp_6_0
+  variables:
+    BEAKER_fips: 'yes'
+  script:
+    - 'bundle exec rake beaker:suites'
+
 # ----------------------------------------------------------------------
 # Puppet 4.10 for SIMP 6.1, PE 2016.4 LTS, and PE 2017.2
 el-pup4_10:
@@ -246,6 +284,7 @@ el-pup5_5-fips:
   script:
     - 'bundle exec rake beaker:suites'
 
+
 #=======================================================================
 # Deployment Jobs
 
diff --git a/.travis.yml b/.travis.yml
index 64d02ca..de7f8ef 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -54,6 +54,18 @@ jobs:
       script:
         - bundle exec rake spec
 
+    - stage: spec
+      rvm: 2.1.9
+      env: STRICT_VARIABLES=yes TRUSTED_NODE_DATA=yes PUPPET_VERSION="~> 4.9.2"
+      script:
+        - bundle exec rake spec
+
+    - stage: spec
+      rvm: 2.1.9
+      env: STRICT_VARIABLES=yes TRUSTED_NODE_DATA=yes PUPPET_VERSION="~> 4.7.0"
+      script:
+        - bundle exec rake spec
+
     - stage: deploy
       rvm: 2.4.1
       script:
diff --git a/metadata.json b/metadata.json
index 1aa0f01..31e4feb 100644
--- a/metadata.json
+++ b/metadata.json
@@ -14,7 +14,7 @@
     "syslog"
   ],
   "dependencies": [
-    { "name": "camptocamp/systemd",
+    { "name": "simp/systemd",
       "version_requirement": ">= 1.1.1 < 2.0.0"
     },
     {