3.0 tests win

Improving on https://github.com/cakephp/cakephp/pull/3820