Fixes: https://pagure.io/koji/issue/1776
rebased onto 69bb6bb1147eb480e977261112a2364a52d7e8a6
failing test
Unsure about failing tests, but otherwise LGTM.
Obsoleted by PR #1785
Pull-Request has been closed by tkopecek
Fixes: https://pagure.io/koji/issue/1776