Adapt docker tests (follow-up of PR-1366)