diff --git a/.coveralls.yml b/.coveralls.yml
new file mode 100644
index 00000000..d8e62b56
--- /dev/null
+++ b/.coveralls.yml
@@ -0,0 +1,4 @@
+#.coveralls.yml
+
+src_dir: .
+coverage_clover: ../build/logs/clover.xml
diff --git a/.travis.yml b/.travis.yml
index b36a5c98..e353ba19 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -31,6 +31,7 @@ env:
     - EXTNAME="board3/portal"
     - SNIFF="1"        # Should we run code sniffer on your code?
     - IMAGE_ICC="1"    # Should we run icc profile sniffer on your images?
+    - COVERALLS="1"    # Should we run coveralls?
     - PHPBB_BRANCH="develop-ascraeus"
 
 branches:
@@ -40,22 +41,24 @@ branches:
 
 install:
   - travis/prepare-phpbb.sh $EXTNAME $PHPBB_BRANCH
+  - cp .coveralls.yml ../../phpBB3/phpBB/.coveralls.yml
   - cd ../../phpBB3
+  - sh -c "if [ '$COVERALLS' != '0' ]; then ../board3/Board3-Portal/travis/prepare-coveralls.sh $DB $TRAVIS_PHP_VERSION; fi"
   - travis/prepare-extension.sh $EXTNAME $PHPBB_BRANCH
   - travis/setup-phpbb.sh $DB $TRAVIS_PHP_VERSION
 
 before_script:
   - travis/setup-database.sh $DB $TRAVIS_PHP_VERSION
   - mkdir build/logs
-  - git clone "https://github.com/satooshi/php-coveralls.git" "phpBB/vendor/coveralls"
+  - chmod +wx build/logs
 
 script:
   - sh -c "if [ '$SNIFF' != '0' ]; then travis/phing-sniff.sh $DB $TRAVIS_PHP_VERSION; fi"
   - sh -c "if [ '$IMAGE_ICC' != '0' ]; then travis/check-image-icc-profiles.sh $DB $TRAVIS_PHP_VERSION; fi"
-  - sh -c "if [ '$TRAVIS_PHP_VERSION' == '5.5' -a '$DB' == 'mysqli' ]; then phpBB/vendor/bin/phpunit --configuration phpBB/ext/$EXTNAME/travis/phpunit-$DB-travis.xml --bootstrap ./tests/bootstrap.php --coverage-clover build/logs/clover.xml; else phpBB/vendor/bin/phpunit --configuration phpBB/ext/$EXTNAME/travis/phpunit-$DB-travis.xml --bootstrap ./tests/bootstrap.php; fi"
+  - ../board3/Board3-Portal/travis/run-testsuite.sh $DB $TRAVIS_PHP_VERSION
 
 after_script:
-  - php phpBB/vendor/coveralls/composer/bin/coveralls
+  - php phpBB/vendor/bin/coveralls -v
 
 notifications:
   email:
diff --git a/travis/prepare-coveralls.sh b/travis/prepare-coveralls.sh
new file mode 100755
index 00000000..010cd997
--- /dev/null
+++ b/travis/prepare-coveralls.sh
@@ -0,0 +1,25 @@
+#!/bin/bash
+#
+# This file is part of the phpBB Forum Software package.
+#
+# @copyright (c) phpBB Limited <https://www.phpbb.com>
+# @license GNU General Public License, version 2 (GPL-2.0)
+#
+# For full copyright and license information, please see
+# the docs/CREDITS.txt file.
+#
+set -e
+set -x
+
+DB=$1
+TRAVIS_PHP_VERSION=$2
+
+if [ "$TRAVIS_PHP_VERSION" == "5.5" -a "$DB" == "mysqli" ]
+then
+	sed -n '1h;1!H;${;g;s/\"squizlabs\/php_codesniffer\": \"1.*\"/\"squizlabs\/php_codesniffer\": \"1.*\",\n\t\t\"satooshi\/php-coveralls\"\: \"dev-master\"/g;p;}' phpBB/composer.json &> composer.json
+	cp composer.json phpBB/composer.json
+	cd phpBB
+	rm composer.lock
+	php ../composer.phar update
+	cd ..
+fi
diff --git a/travis/run-testsuite.sh b/travis/run-testsuite.sh
new file mode 100755
index 00000000..fbe5ea07
--- /dev/null
+++ b/travis/run-testsuite.sh
@@ -0,0 +1,22 @@
+#!/bin/bash
+#
+# This file is part of the phpBB Forum Software package.
+#
+# @copyright (c) phpBB Limited <https://www.phpbb.com>
+# @license GNU General Public License, version 2 (GPL-2.0)
+#
+# For full copyright and license information, please see
+# the docs/CREDITS.txt file.
+#
+set -e
+set -x
+
+DB=$1
+TRAVIS_PHP_VERSION=$2
+
+if [ "$TRAVIS_PHP_VERSION" == "5.5" -a "$DB" == "mysqli" ]
+then
+	phpBB/vendor/bin/phpunit --configuration phpBB/ext/$EXTNAME/travis/phpunit-$DB-travis.xml --bootstrap ./tests/bootstrap.php --coverage-clover build/logs/clover.xml
+else
+	phpBB/vendor/bin/phpunit --configuration phpBB/ext/$EXTNAME/travis/phpunit-$DB-travis.xml --bootstrap ./tests/bootstrap.php
+fi