diff --git a/.travis.yml b/.travis.yml
index c31c6645d6b2c..cf69a5d783e0d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,13 +29,15 @@ before_script:
   # Set up Apache
   # - ./build/travis/php-apache.sh
   # Enable additional PHP extensions
-  - sh -c "if [ '$TRAVIS_PHP_VERSION' != '7.0' ]; then phpenv config-add build/travis/phpenv/memcached.ini; fi"
-  - sh -c "if [ '$TRAVIS_PHP_VERSION' != '7.0' ]; then phpenv config-add build/travis/phpenv/apc-$TRAVIS_PHP_VERSION.ini; fi"
-  - sh -c "if [ '$TRAVIS_PHP_VERSION' != '7.0' ]; then phpenv config-add build/travis/phpenv/redis.ini; fi"
+  - if [[ "$TRAVIS_PHP_VERSION" != '7.0' ]]; then phpenv config-add build/travis/phpenv/memcached.ini; fi
+  - if [[ "$TRAVIS_PHP_VERSION" != '7.0' ]]; then phpenv config-add build/travis/phpenv/apc-$TRAVIS_PHP_VERSION.ini; fi
+  - if [[ "$TRAVIS_PHP_VERSION" != '7.0' ]]; then phpenv config-add build/travis/phpenv/redis.ini; fi
 
 script:
-  - phpunit --configuration travisci-phpunit.xml
-  - sh -c "if [ '$TRAVIS_PHP_VERSION' != '7.0' ]; then libraries/vendor/bin/phpcs --report=full --extensions=php -p --standard=build/phpcs/Joomla .; fi"
+  # Run PHPUnit tests
+  - libraries/vendor/bin/phpunit --configuration travisci-phpunit.xml
+  # Run PHPCS tests
+  - if [[ "$TRAVIS_PHP_VERSION" != '7.0' ]]; then libraries/vendor/bin/phpcs --report=full --extensions=php -p --standard=build/phpcs/Joomla .; fi
 
 branches:
   except:
@@ -48,4 +50,3 @@ notifications:
     on_success: change  # options: [always|never|change] default: always
     on_failure: always  # options: [always|never|change] default: always
     on_start: false     # default: false
-