Merge branch 'fix_parallel_testing_on_ci' into 'master'

Fix parallel testing on ci

See merge request !330
2 jobs for master in 16 minutes and 17 seconds (queued for 4 seconds)