Tweak runner for 2.6