Combine remote and local tests

@tomru, thanks for the hint in the right direction :boom: