Make tests consistent with #830
PR #1002
Commit 7ca9d782 fixes this issue
Commit bd649d27 fixes this issue
Metadata Update from @tkopecek: - Issue set to the milestone: 1.17
This issue has been migrated to Fedora Forge: https://forge.fedoraproject.org/koji/koji/issues/1001
Please continue any further discussion there.