[Bootstrap] (Re)fix bootstrap for integration tests