diff --git a/entitymanager/src/test-resources/cfgxmlpar/META-INF/persistence.xml b/entitymanager/src/test/resources/cfgxmlpar/META-INF/persistence.xml
similarity index 100%
rename from entitymanager/src/test-resources/cfgxmlpar/META-INF/persistence.xml
rename to entitymanager/src/test/resources/cfgxmlpar/META-INF/persistence.xml
diff --git a/entitymanager/src/test-resources/cfgxmlpar/org/hibernate/ejb/test/pack/cfgxmlpar/hibernate.cfg.xml b/entitymanager/src/test/resources/cfgxmlpar/org/hibernate/ejb/test/pack/cfgxmlpar/hibernate.cfg.xml
similarity index 100%
rename from entitymanager/src/test-resources/cfgxmlpar/org/hibernate/ejb/test/pack/cfgxmlpar/hibernate.cfg.xml
rename to entitymanager/src/test/resources/cfgxmlpar/org/hibernate/ejb/test/pack/cfgxmlpar/hibernate.cfg.xml
diff --git a/entitymanager/src/test-resources/defaultpar/META-INF/orm.xml b/entitymanager/src/test/resources/defaultpar/META-INF/orm.xml
similarity index 100%
rename from entitymanager/src/test-resources/defaultpar/META-INF/orm.xml
rename to entitymanager/src/test/resources/defaultpar/META-INF/orm.xml
diff --git a/entitymanager/src/test-resources/defaultpar/META-INF/persistence.xml b/entitymanager/src/test/resources/defaultpar/META-INF/persistence.xml
similarity index 100%
rename from entitymanager/src/test-resources/defaultpar/META-INF/persistence.xml
rename to entitymanager/src/test/resources/defaultpar/META-INF/persistence.xml
diff --git a/entitymanager/src/test-resources/defaultpar/org/hibernate/ejb/test/pack/defaultpar/Mouse.hbm.xml b/entitymanager/src/test/resources/defaultpar/org/hibernate/ejb/test/pack/defaultpar/Mouse.hbm.xml
similarity index 100%
rename from entitymanager/src/test-resources/defaultpar/org/hibernate/ejb/test/pack/defaultpar/Mouse.hbm.xml
rename to entitymanager/src/test/resources/defaultpar/org/hibernate/ejb/test/pack/defaultpar/Mouse.hbm.xml
diff --git a/entitymanager/src/test-resources/excludehbmpar/META-INF/orm2.xml b/entitymanager/src/test/resources/excludehbmpar/META-INF/orm2.xml
similarity index 100%
rename from entitymanager/src/test-resources/excludehbmpar/META-INF/orm2.xml
rename to entitymanager/src/test/resources/excludehbmpar/META-INF/orm2.xml
diff --git a/entitymanager/src/test-resources/excludehbmpar/META-INF/persistence.xml b/entitymanager/src/test/resources/excludehbmpar/META-INF/persistence.xml
similarity index 100%
rename from entitymanager/src/test-resources/excludehbmpar/META-INF/persistence.xml
rename to entitymanager/src/test/resources/excludehbmpar/META-INF/persistence.xml
diff --git a/entitymanager/src/test-resources/excludehbmpar/org/hibernate/ejb/test/pack/excludehbmpar/Mouse.hbm.xml b/entitymanager/src/test/resources/excludehbmpar/org/hibernate/ejb/test/pack/excludehbmpar/Mouse.hbm.xml
similarity index 100%
rename from entitymanager/src/test-resources/excludehbmpar/org/hibernate/ejb/test/pack/excludehbmpar/Mouse.hbm.xml
rename to entitymanager/src/test/resources/excludehbmpar/org/hibernate/ejb/test/pack/excludehbmpar/Mouse.hbm.xml
diff --git a/entitymanager/src/test-resources/explicitpar/META-INF/orm.xml b/entitymanager/src/test/resources/explicitpar/META-INF/orm.xml
similarity index 100%
rename from entitymanager/src/test-resources/explicitpar/META-INF/orm.xml
rename to entitymanager/src/test/resources/explicitpar/META-INF/orm.xml
diff --git a/entitymanager/src/test-resources/explicitpar/META-INF/persistence.xml b/entitymanager/src/test/resources/explicitpar/META-INF/persistence.xml
similarity index 100%
rename from entitymanager/src/test-resources/explicitpar/META-INF/persistence.xml
rename to entitymanager/src/test/resources/explicitpar/META-INF/persistence.xml
diff --git a/entitymanager/src/test-resources/explodedpar/META-INF/persistence.xml b/entitymanager/src/test/resources/explodedpar/META-INF/persistence.xml
similarity index 100%
rename from entitymanager/src/test-resources/explodedpar/META-INF/persistence.xml
rename to entitymanager/src/test/resources/explodedpar/META-INF/persistence.xml
diff --git a/entitymanager/src/test-resources/explodedpar/org/hibernate/ejb/test/pack/explodedpar/Elephant.hbm.xml b/entitymanager/src/test/resources/explodedpar/org/hibernate/ejb/test/pack/explodedpar/Elephant.hbm.xml
similarity index 100%
rename from entitymanager/src/test-resources/explodedpar/org/hibernate/ejb/test/pack/explodedpar/Elephant.hbm.xml
rename to entitymanager/src/test/resources/explodedpar/org/hibernate/ejb/test/pack/explodedpar/Elephant.hbm.xml
diff --git a/entitymanager/src/test-resources/externaljar/META-INF/MANIFEST.MF b/entitymanager/src/test/resources/externaljar/META-INF/MANIFEST.MF
similarity index 100%
rename from entitymanager/src/test-resources/externaljar/META-INF/MANIFEST.MF
rename to entitymanager/src/test/resources/externaljar/META-INF/MANIFEST.MF
diff --git a/entitymanager/src/test-resources/externaljar/META-INF/orm.xml b/entitymanager/src/test/resources/externaljar/META-INF/orm.xml
similarity index 100%
rename from entitymanager/src/test-resources/externaljar/META-INF/orm.xml
rename to entitymanager/src/test/resources/externaljar/META-INF/orm.xml
diff --git a/entitymanager/src/test-resources/hibernate.properties b/entitymanager/src/test/resources/hibernate.properties
similarity index 100%
rename from entitymanager/src/test-resources/hibernate.properties
rename to entitymanager/src/test/resources/hibernate.properties
diff --git a/entitymanager/src/test-resources/log4j.properties b/entitymanager/src/test/resources/log4j.properties
similarity index 100%
rename from entitymanager/src/test-resources/log4j.properties
rename to entitymanager/src/test/resources/log4j.properties
diff --git a/entitymanager/src/test-resources/overridenpar/META-INF/persistence.xml b/entitymanager/src/test/resources/overridenpar/META-INF/persistence.xml
similarity index 100%
rename from entitymanager/src/test-resources/overridenpar/META-INF/persistence.xml
rename to entitymanager/src/test/resources/overridenpar/META-INF/persistence.xml
diff --git a/entitymanager/src/test-resources/space par/META-INF/persistence.xml b/entitymanager/src/test/resources/space par/META-INF/persistence.xml
similarity index 100%
rename from entitymanager/src/test-resources/space par/META-INF/persistence.xml
rename to entitymanager/src/test/resources/space par/META-INF/persistence.xml
diff --git a/entitymanager/src/test-resources/war/WEB-INF/classes/META-INF/orm.xml b/entitymanager/src/test/resources/war/WEB-INF/classes/META-INF/orm.xml
similarity index 100%
rename from entitymanager/src/test-resources/war/WEB-INF/classes/META-INF/orm.xml
rename to entitymanager/src/test/resources/war/WEB-INF/classes/META-INF/orm.xml
diff --git a/entitymanager/src/test-resources/war/WEB-INF/classes/META-INF/persistence.xml b/entitymanager/src/test/resources/war/WEB-INF/classes/META-INF/persistence.xml
similarity index 100%
rename from entitymanager/src/test-resources/war/WEB-INF/classes/META-INF/persistence.xml
rename to entitymanager/src/test/resources/war/WEB-INF/classes/META-INF/persistence.xml
diff --git a/entitymanager/src/test-resources/war/WEB-INF/classes/org/hibernate/ejb/test/pack/war/Mouse.hbm.xml b/entitymanager/src/test/resources/war/WEB-INF/classes/org/hibernate/ejb/test/pack/war/Mouse.hbm.xml
similarity index 100%
rename from entitymanager/src/test-resources/war/WEB-INF/classes/org/hibernate/ejb/test/pack/war/Mouse.hbm.xml
rename to entitymanager/src/test/resources/war/WEB-INF/classes/org/hibernate/ejb/test/pack/war/Mouse.hbm.xml