A phase-shifting interferometry (PSI) method and corresponding system including: (i) recording an interferogram for each phase in a sequence of phases between test light reflected from a test surface and reference light reflected from a reference surface, the test and reference light being derived from a common source, each interferogram corresponding to an intensity pattern produced by interfering the reflected test light with the reflected reference light, the interferograms defining an interferometry signal for each of different transverse locations of a cavity defined by the test and reference surfaces, each interferometry signal including a series of intensity values corresponding to the sequence of phases, with the difference between each pair of phases in the sequence defining a corresponding phase shift increment; (ii) calculating an initial phase map for the cavity based on at least some of the recorded interferograms; (iii) calculating an estimate for each of at least some of the phase shift increments based on the initial phase map and at least some of the recorded interferograms; and (iv) calculating an improved phase map based on the calculated estimates for the phase shift increments and at least some of the recorded interferograms.