This is a partial port, just to have more tests that
  weren't afected by the patches for keep apache as entry-point
  of the backend.