system-test: retain custom headers