There is provided a method and apparatus for tuning an optical discriminator to the carrier frequency of an optical signal to allow superior reception of said signal. The carrier frequency of the signal is dithered during a test phase in order to provide information that allows a subsequent tuning phase to optimise the reception of the optical signal, as measured by a signal quality metric. The tuning phase may comprise adjustment of one or both of the carrier frequency and the optical discriminator.