We shouldn't load any local ini files for these tests
Merge commit 'a03f094'

* commit 'a03f094':
  We shouldn't load any local ini files for these tests