Fix tests execution

See #2442