Wip/fedora 20 test suite

This makes the test suite pass with TEST_OS=fedora-20.