A long-term high-temperature testing stress rig has been designed and fabricated for performing in situ neutron diffraction tests at the ENGIN-X beamline, ISIS facility in the UK. It is capable of subjecting metals to high temperatures up to 800°C and uniaxial loading under different boundary conditions including constant load, constant strain and elastic follow-up, each with minimum of external control. Samples are held horizontally between grips and connected to a rigid rig frame, a soft aluminium bar and a stepper motor with forces up to 20kN. A new three zone split electrical resistance furnace which generates a stable and uniform heat atmosphere over 200 mm length was used to heat the samples. An 8 mm diameter port at 45 degrees to the centre of the furnace was made in order to allow the neutron beam through the furnace to illuminate the sample. The entire instrument is mounted on the positioner at ENGIN-X and has the ability to operate continuously while being moved in and out of the neutron diffraction beam. The performance of the rig has been demonstrated by tracking the evolution of lattice strains in Type 316H stainless steel under elastic follow-up control at 550°C.