tests

Merge pull request #2993 from regro/relock-conda #3676

Job	Run time
tests / tests (1)	8m 43s
tests / tests (2)	13m 57s
tests / test-coverage-and-durations	28s
	23m 8s

Provide feedback