diff --git a/.travis.yml b/.travis.yml
index c6563ee8..e34cfaff 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -58,7 +58,7 @@ script:
   - sh -c "if [ '$SNIFF' != '0' ]; then travis/ext-sniff.sh $DB $TRAVIS_PHP_VERSION $EXTNAME; fi"
   - sh -c "if [ '$IMAGE_ICC' != '0' ]; then travis/check-image-icc-profiles.sh $DB $TRAVIS_PHP_VERSION; fi"
   - ../board3/Board3-Portal/travis/run-testsuite.sh $DB $TRAVIS_PHP_VERSION
-  - ../board3/Board3-Portal/travis/run-evp.sh $DB $TRAVIS_PHP_VERSION $EXTNAME $EPV
+  - sh -c "if [ '$EPV' != '0' ]; then ../board3/Board3-Portal/travis/run-epv.sh $DB $TRAVIS_PHP_VERSION $EXTNAME; fi"
 
 after_script:
   - sh -c "if [ '$COVERALLS' != '0' ]; then ../board3/Board3-Portal/travis/run-coveralls.sh $DB $TRAVIS_PHP_VERSION; fi"
diff --git a/travis/run-epv.sh b/travis/run-epv.sh
index 7b5f1f49..5c6aebda 100755
--- a/travis/run-epv.sh
+++ b/travis/run-epv.sh
@@ -11,9 +11,8 @@ set -x
 DB=$1
 TRAVIS_PHP_VERSION=$2
 EXTNAME=$3
-EPV=$4
 
-if [ "$TRAVIS_PHP_VERSION" == "5.5" -a "$DB" == "mysqli" -a "$EPV" == "1" ]
+if [ "$TRAVIS_PHP_VERSION" == "5.5" -a "$DB" == "mysqli" ]
 then
-	phpBB/ext/$EXTNAME/vendor/bin/EPV.php run --dir='phpBB/ext/$EXTNAME/'
+	phpBB/ext/$EXTNAME/vendor/bin/EPV.php run --dir="phpBB/ext/$EXTNAME/"
 fi