... that was causing test failures on some but not all platforms.

(cherry picked from commit c56e0858)
(cherry picked from commit 2263a59a)

Change-Id: I0d04cd6e540ea2693a3ec8511d615a9b0fecf456
Reviewed-on: https://gerrit.libreoffice.org/20757Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
(cherry picked from commit c7d111b5)