backport-1.8-3948

Backport #3948: `BUG: runtests: make -t option work again`