Fix intermittent "mkeys" system test failures

Closes #477 (closed)

Edited by Michał Kępień

Merge request reports