diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1829a29..2824bde 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -194,10 +194,10 @@ variables:
     BEAKER_PUPPET_COLLECTION: 'puppet5'
     MATRIX_RUBY_VERSION: '2.4'
 
-.pup_5_5_17: &pup_5_5_17
+.pup_5_5_20: &pup_5_5_20
   image: 'ruby:2.4'
   variables:
-    PUPPET_VERSION: '5.5.17'
+    PUPPET_VERSION: '5.5.20'
     BEAKER_PUPPET_COLLECTION: 'puppet5'
     MATRIX_RUBY_VERSION: '2.4'
 
@@ -283,14 +283,16 @@ pup6-lint:
 pup5-unit:
   <<: *pup_5
   <<: *unit_tests
+  <<: *with_SIMP_SPEC_MATRIX_LEVEL_2
 
-pup5.5.17-unit:
-  <<: *pup_5_5_17
+pup5.5.20-unit:
+  <<: *pup_5_5_20
   <<: *unit_tests
 
 pup6-unit:
   <<: *pup_6
   <<: *unit_tests
+  <<: *with_SIMP_SPEC_MATRIX_LEVEL_2
 
 pup6.16.0-unit:
   <<: *pup_6_16_0
@@ -306,26 +308,26 @@ pup6.16.0-unit:
 # Repo-specific content
 # ==============================================================================
 
-pup5.5.17:
-  <<: *pup_5_5_17
+pup5.5.20:
+  <<: *pup_5_5_20
   <<: *acceptance_base
   script:
     - 'bundle exec rake beaker:suites'
 
-pup5.5.17-fips:
-  <<: *pup_5_5_17
+pup5.5.20-fips:
+  <<: *pup_5_5_20
   <<: *acceptance_base
   script:
     - 'BEAKER_fips=yes bundle exec rake beaker:suites'
 
-pup5.5.17-oel:
-  <<: *pup_5_5_17
+pup5.5.20-oel:
+  <<: *pup_5_5_20
   <<: *acceptance_base
   script:
     - 'bundle exec rake beaker:suites[default,oel]'
 
-pup5.5.17-oel-fips:
-  <<: *pup_5_5_17
+pup5.5.20-oel-fips:
+  <<: *pup_5_5_20
   <<: *acceptance_base
   <<: *with_SIMP_ACCEPTANCE_MATRIX_LEVEL_3
   script:
diff --git a/.pmtignore b/.pmtignore
index c941f3f..9e9696f 100644
--- a/.pmtignore
+++ b/.pmtignore
@@ -8,6 +8,7 @@
 .yardoc
 dist/
 pkg/
+spec/defines/
 spec/fixtures/
 spec/acceptance/
 spec/rp_env/
@@ -21,3 +22,4 @@ vendor/
 junit/
 log/
 doc/
+tests/
diff --git a/.puppet-lint.rc b/.puppet-lint.rc
index 975f724..5cbbdec 100644
--- a/.puppet-lint.rc
+++ b/.puppet-lint.rc
@@ -4,3 +4,6 @@
 --no-140chars-check
 --no-trailing_comma-check
 --no-empty_string_assignment-check
+# This is here because the code can't handle lookups in parameters and SIMP
+# modules have a LOT of those
+--no-parameter_order-check