The combustion test rig at the High-Speed Laboratory (HSL) of the Delft University of Technology has been designed to contribute to the research towards the conception of alternative gas-turbine combustors for low pollutant-emissions. The test-rig is currently able to operate on methane (CH4) and hydrogen (H2). The mixture of the fuel can be exactly defines, by controlled dilution with N2 and CO2. Before entering the combustion chamber, the gasses are pre-heated by a 48 kW heater, which can reach up to 900K at the maximum operating pressure of 10 bar. The combustion chamber is a clear cylinder for optical access, to allow for Particle Image Velocimetry (PIV) of the combustion process. Furthermore, pressure sensors and thermo-couples are located at the combustor exit for instantaneous pressure and temperature measurements.