KFSUPGRADE-1002 Use fixtures