https://bugzilla.redhat.com/show_bug.cgi?id=1013536  - fixing tests
Merge pull request #1326 from andytaylor/master

https://bugzilla.redhat.com/show_bug.cgi?id=1013536  - fixing tests