Revert "experiment: can travis run both test suites?"
Revert "experiment: can travis run both test suites?"

This reverts commit e109390e4ad2970c9d15f928ea7c0c49585fb2c7.

Toryt/contracts,Toryt/contracts,Toryt/contracts