Along with !231 (closed), it makes running 'tox' actually green.
Migrated from D1696 (view on Phabricator)