diff --git a/.travis.yml b/.travis.yml
index dd947a72e0..e82e815b3b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,11 +20,11 @@ before_script:
   - php ../composer.phar install --dev --no-interaction --prefer-source
   - cd ..
   - sh -c "if [ `php -r "echo (int) version_compare(PHP_VERSION, '5.3.19', '>=');"` = "1" ]; then travis/setup-webserver.sh; fi"
+
+script:
   - cd build
   - sh -c "if [ '$TRAVIS_PHP_VERSION' = '5.5' -a '$DB' = 'mysql' ]; then ../phpBB/vendor/bin/phing sniff; fi"
   - cd ..
-
-script:
   - phpBB/vendor/bin/phpunit --configuration travis/phpunit-$DB-travis.xml
   
 notifications:
diff --git a/build/build.xml b/build/build.xml
index 9376f95143..c685a6f516 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -88,14 +88,14 @@
 				--ignore=phpBB/phpbb/*
 				--ignore=phpBB/vendor/*
 				phpBB"
-			dir="." passthru="true" />
+			dir="." checkreturn="true" passthru="true" />
 		<exec command="phpBB/vendor/bin/phpcs
 				-s
 				--extensions=php
 				--standard=build/code_sniffer/ruleset-php-strict.xml
 				--ignore=phpBB/phpbb/db/migration/data/v30x/*
 				phpBB/phpbb"
-			dir="." passthru="true" />
+			dir="." checkreturn="true" passthru="true" />
 	</target>
 
 	<target name="docs">