A Wavelength Adaptation Module and a method therein for adapting an Optical Time Domain Reflectometry, OTDR, signal for supervision of Optical Network Terminals, ONTs, in a Passive Optical Network, PON, are provided. The wavelength of the OTDR signal is adapted to have a selected wavelength to enable a splitter in a remote node to forward the OTDR signal to a dedicated group of ONTs in the PON, thereby supervising the fiber links between the remote node and the dedicated group of ONTs. Likewise, a remote node and a method therein for receiving an OTDR signal having a pre-selected wavelength from the Wavelength Adaptation Module and for outputting the OTDR signal to a dedicated group of ONTs with regards to the pre-selected wavelength of the received OTDR signal are provided.