Issue 6084 make 3 0 unit tests run