Patch for basic HA cluster test (2/2)