Propagate test_headers change through bootstrap