Merge pull request #1651 from bmwiedemann/onecore

Fix test_issue_1418 to pass on 1-core VM