We should have this as test scaffolding rather than depending on a specific repo

cc @Haacked @half-ogre