It's all the almost-identical configuration that is the problem, not the number of files as such.  Having two persistence units in the same persistence-test.xml wouldn't fix that, even if we could do it.  Any code which passes tests run using persistence-test.xml might fail when run in production with the real persistence.xml, so we want the test/prod configuration to be identical if possible, or as close as we can get.

A test jar might help, yes.  Moving persistence.xml to zanata-model might allow us to remove all the explicit class names too.