Reverted run-tests back to upstream/devel, I don't know what happend here