I've now also submitted the changes in "fabric-tests.patch" to the upstream project.