diff --git a/.travis.yml b/.travis.yml
index 3d13d027..d3b07f48 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,14 +14,15 @@ before_script:
   - cd ../../
   - git clone "git://github.com/phpbb/phpbb3.git" "phpBB3"
   - mkdir phpBB3/phpBB/ext
-  - find -type d -name "Board3-Portal" -print | xargs -i mv {} phpBB3/phpBB/ext/board3
+  - mkdir phpBB3/phpBB/ext/board3
+  - find -type d -name "Board3-Portal" -print | xargs -i mv {} phpBB3/phpBB/ext/board3/portal
 
   # Setup the dependencies
   - cd phpBB3/phpBB
   - php ../composer.phar install --dev --no-interaction --prefer-source
 
   # Setup the tests/travis
-  - cd ext/board3
+  - cd ext/board3/portal
   - sh -c "if [ '$DB' = 'postgres' ]; then psql -c 'DROP DATABASE IF EXISTS phpbb_tests;' -U postgres; fi"
   - sh -c "if [ '$DB' = 'postgres' ]; then psql -c 'create database phpbb_tests;' -U postgres; fi"
   - sh -c "if [ '$DB' = 'mysql' ]; then mysql -e 'create database IF NOT EXISTS phpbb_tests;'; fi"
@@ -31,10 +32,10 @@ before_script:
   - rm -R -f phpredis
 
 script:
-  - cd ../../../build
+  - cd ../../../../build
   - sh -c "if [ '$TRAVIS_PHP_VERSION' = '5.5' -a '$DB' = 'mysql' ]; then ../phpBB/vendor/bin/phing sniff; fi"
-  - cd ../phpBB/ext/board3
-  - ../../vendor/bin/phpunit --configuration travis/phpunit-$DB-travis.xml
+  - cd ../phpBB/ext/board3/portal
+  - ../../../vendor/bin/phpunit --configuration travis/phpunit-$DB-travis.xml
 
 notifications:
   email: