In a method of detecting a fault in a fluid-working machine including a plurality of working chambers of cyclically varying volume, each working chamber is operable to displace a volume of working fluid which is selectable for each cycle of working chamber volume to carry out a working function responsive to a received demand signal. An output parameter of the fluid working machine, which is responsive to the displacement of working fluid by one or more of the working chambers to carry out the working function, is measured. It is determined whether the measured output parameter fulfils at least one acceptable function criterion, taking into account the previously selected net displacement of working fluid by a working chamber during a cycle of working chamber volume to carry out the working function.