Merge branch 'fix-tests-environment-backcompat-example' into maint * fix-tests-environment-backcompat-example: tests: fix weakness in 'tests-environment-backcompat.test'