Abstract. On Wendelstein 7-X, electron density and electron temperature profiles are planned to be measured by Thomson scattering. The specific system employs fiber bundles for the scattered light which is detected by means of a five-channel polychromator system. The detection system is assembled and its components are characterized. A calibration technique employing a super-continuum light source is assessed by comparison with a calibration technique using an optical parametric oscillator laser system. The characterization is preparing further diagnostic optimization studies employing a virtual instrument.