[TASK] Fix failing functional tests

Resolves: #61383
Releases: 1.9, 2.0
Change-Id: Ieb47a2e87d44e07717c8465248d998288eb9cad3
Reviewed-on: http://review.typo3.org/32609
Reviewed-by: Wouter Wolters <typo3@wouterwolters.nl>
Tested-by: Wouter Wolters <typo3@wouterwolters.nl>