Can this step be moved into run-tests.py?