Tobias Lanz could you try this patch, please?
https://github.com/hibernate/hibernate-orm/pull/2792
It should be less fragile.
I see you are using IBM JVM, you did run that one before with 5.3.7?
(still interested if you can test 5.3.8)