Fix travis again

This seems to fix #1935. It also fixes the issue we had in which the test-suite would not finish properly it would just hang.