Switch to better matrix configuration (in setup.cfg).