rework to run on top of travis-core