diff --git a/.travis.yml b/.travis.yml
index ff1bf17e..309ea9bf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,47 +6,35 @@ cache: bundler
 before_install:
   - rm -f Gemfile.lock
 script:
-  - 'travis_retry bundle exec rake $CHECK'
+  - 'travis_retry bundle exec $CHECK'
 matrix:
   fast_finish: true
   include:
   - rvm: 2.1.9
     bundler_args: --without system_tests development release
-    env: PUPPET_VERSION="~> 4.0" CHECK=test PARALLEL_TEST_PROCESSORS=12
+    env: PUPPET_VERSION="~> 4.i0 CHECK="rake test" PARALLEL_TEST_PROCESSORS=12
   - rvm: 2.4.3
     bundler_args: --without system_tests development release
-    env: PUPPET_VERSION="~> 5.0" CHECK=test_with_coveralls
+    env: PUPPET_VERSION="~> 5.0" CHECK="rake test_with_coveralls"
   - rvm: 2.5.0
     bundler_args: --without system_tests development release
-    env: PUPPET_VERSION="~> 5.0" CHECK=test_with_coveralls
+    env: PUPPET_VERSION="~> 5.0" CHECK="rake test_with_coveralls"
   - rvm: 2.4.3
     bundler_args: --without system_tests development release
-    env: PUPPET_VERSION="~> 5.0" CHECK=rubocop
+    env: PUPPET_VERSION="~> 5.0" CHECK="rake rubocop"
   - rvm: 2.4.3
     bundler_args: --without system_tests development release
-    env: PUPPET_VERSION="~> 5.0" CHECK=build DEPLOY_TO_FORGE=yes
+    env: PUPPET_VERSION="~> 5.0" CHECK="rake build" DEPLOY_TO_FORGE=yes
   - rvm: 2.4.2
     bundler_args: --without development release
     dist: trusty
-    env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_set=docker/ubuntu-16.04 CHECK=beaker
+    env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_set=docker/ubuntu-16.04 CHECK="rspec spec/acceptance/php_spec.rb"
     services: docker
     sudo: require
   - rvm: 2.4.2
     bundler_args: --without development release
     dist: trusty
-    env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_set=docker/ubuntu-14.04 CHECK=beaker
-    services: docker
-    sudo: require
-  - rvm: 2.4.2
-    bundler_args: --without development release
-    dist: trusty
-    env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_set=docker/centos-7 CHECK=beaker
-    services: docker
-    sudo: require
-  - rvm: 2.4.2
-    bundler_args: --without development release
-    dist: trusty
-    env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_set=docker/debian-8 CHECK=beaker
+    env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_set=docker/ubuntu-16.04 CHECK="rspec spec/acceptance/php56_spec.rb"
     services: docker
     sudo: require
 branches: