This reverts commit3e7738fd3fand a minor temporary change in base functional test made in07e5fb8cbe. Since tox-2.3.1 was released, all the abovementioned changes are not needed anymore. Closes-bug: #1528494 Change-Id: I23d3cd4c7fa31e58a4f173a1cc15c4b54f794f43