diff --git a/.travis.yml b/.travis.yml
index 78b5066c..a32a7ab9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,18 +18,25 @@ cache:
 
 matrix:
   fast_finish: true
+  include:
+    - env: CHECK=phpcs
+      php: nightly # Note: will be allowed failure
+    - env: CHECK=phpcs
+      php: '7.0'
+    - env: CHECK=phpcs
+      php: '5.4'
   allow_failures:
     - php: nightly
 
 env:
-  - DB=mysql DIRECTOR_TESTDB_RES="Director MySQL TestDB" DIRECTOR_TESTDB="director_test"
-  - DB=pgsql DIRECTOR_TESTDB_RES="Director PostgreSQL TestDB" DIRECTOR_TESTDB="director_test"
+  - CHECK=phpunit DB=mysql DIRECTOR_TESTDB_RES="Director MySQL TestDB" DIRECTOR_TESTDB="director_test"
+  - CHECK=phpunit DB=pgsql DIRECTOR_TESTDB_RES="Director PostgreSQL TestDB" DIRECTOR_TESTDB="director_test"
     DIRECTOR_TESTDB_USER="director_test"
 
 before_script:
   - ./test/setup_vendor.sh
-  - ./test/travis-prepare.sh
+  - '[ "$CHECK" != phpunit ] || ./test/travis-prepare.sh'
 
 script:
-  - php vendor/phpcs.phar
-  - php vendor/phpunit.phar --testdox || php vendor/phpunit.phar --verbose
+  - '[ "$CHECK" != phpcs ] || php vendor/phpcs.phar'
+  - '[ "$CHECK" != phpunit ] || php vendor/phpunit.phar --testdox || php vendor/phpunit.phar --verbose'
diff --git a/test/travis-prepare.sh b/test/travis-prepare.sh
index c625a4b8..a3ba9008 100755
--- a/test/travis-prepare.sh
+++ b/test/travis-prepare.sh
@@ -2,6 +2,8 @@
 
 set -ex
 
+: "${DIRECTOR_TESTDB:=director_test}"
+
 psql_cmd() {
     psql -U postgres ${DIRECTOR_TESTDB} -q -c "$@"
 }
@@ -9,6 +11,8 @@ psql_cmd() {
 if [ "$DB" = mysql ]; then
     mysql -u root -e "CREATE DATABASE ${DIRECTOR_TESTDB};"
 elif [ "$DB" = pgsql ]; then
+    : "${DIRECTOR_TESTDB_USER:=director_test}"
+
     psql -U postgres postgres -q -c "CREATE DATABASE ${DIRECTOR_TESTDB} WITH ENCODING 'UTF8';"
     psql_cmd "CREATE USER ${DIRECTOR_TESTDB_USER} WITH PASSWORD 'testing';"
     psql_cmd "GRANT ALL PRIVILEGES ON DATABASE ${DIRECTOR_TESTDB} TO ${DIRECTOR_TESTDB_USER};"