Fix race conditions

[Jan Blechta]

I think that after Chris' merge we are still missing one type of race condition described here: https://bitbucket.org/fenics-project/dijitso/pull-requests/13/attempt-fixing-repeated-failures-on/diff#comment-67591760.

Opening this issue for the record if we keep seeing it on CircleCI.