Fix test setup (was bug 1016685)