diff --git a/.bundle/config b/.bundle/config
index 4014f4b68..5d9a4d403 100644
--- a/.bundle/config
+++ b/.bundle/config
@@ -3,3 +3,4 @@ BUNDLE_JOBS: "4"
 BUNDLE_PATH: "vendor/bundle"
 BUNDLE_DISABLE_SHARED_GEMS: "true"
 BUNDLE_WITHOUT: "system_tests"
+BUNDLE_BUILD: "--no-ri --no-rdoc"
diff --git a/.fixtures.puppet4.yml b/.fixtures.puppet4.yml
index 4c26cce0a..1f07733fe 100644
--- a/.fixtures.puppet4.yml
+++ b/.fixtures.puppet4.yml
@@ -11,9 +11,7 @@ fixtures:
       ref: 6.3.0
     chocolatey:
       repo: puppetlabs/chocolatey
+      ref: 3.3.0
     zypprepo:
       repo: puppet/zypprepo
-    yumrepo_core:
-      repo: "puppetlabs-yumrepo_core"
-      puppet_version: ">= 6.0.0"
-
+      ref: 2.2.2
diff --git a/.travis.yml b/.travis.yml
index ed6b700d4..8d1d9342f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -30,10 +30,6 @@ matrix:
       env: PUPPET_VERSION="~> 5.0" CHECK=test PARALLEL_TEST_PROCESSORS=4
       rvm: 2.4.5
       stage: spec
-    -
-      env: PUPPET_VERSION="~> 4.10" CHECK=test PARALLEL_TEST_PROCESSORS=4 FIXTURES_YML=.fixtures.puppet4.yml
-      rvm: 2.1.9
-      stage: spec
     -
       env: DEPLOY_TO_FORGE=yes
       stage: deploy
diff --git a/manifests/feature/api.pp b/manifests/feature/api.pp
index 87025ed81..b734cc201 100644
--- a/manifests/feature/api.pp
+++ b/manifests/feature/api.pp
@@ -275,7 +275,8 @@
       }
     } # none
 
-    'icinga2': {
+    # icinga2 as default
+    default: {
       $_ticket_salt = undef
       $trusted_cert = "${cert_dir}/trusted-cert.crt"