0.8 compatibility for tests