[ticket/11413] Fix unit tests

PHPBB3-11413
Merge branch 'ticket/11413' of github.com:EXreaction/phpbb3 into ticket/11413