We might also want to consider a switch to JUnit 5.
Not sure if it brings many more benefits but I would expect it to be somewhat more helpful with such details, or (I hear?) it's better extensible.