PMO-2233: preparation of test infrastructure