diff --git a/core/src/etc/test-resources/log4j.properties b/core/src/test/resources/log4j.properties
similarity index 100%
rename from core/src/etc/test-resources/log4j.properties
rename to core/src/test/resources/log4j.properties
diff --git a/core/src/etc/test-resources/org/springframework/ws/endpoint/interceptor/invalidMessage.xml b/core/src/test/resources/org/springframework/ws/endpoint/interceptor/invalidMessage.xml
similarity index 100%
rename from core/src/etc/test-resources/org/springframework/ws/endpoint/interceptor/invalidMessage.xml
rename to core/src/test/resources/org/springframework/ws/endpoint/interceptor/invalidMessage.xml
diff --git a/core/src/etc/test-resources/org/springframework/ws/endpoint/interceptor/productSchema.xsd b/core/src/test/resources/org/springframework/ws/endpoint/interceptor/productSchema.xsd
similarity index 100%
rename from core/src/etc/test-resources/org/springframework/ws/endpoint/interceptor/productSchema.xsd
rename to core/src/test/resources/org/springframework/ws/endpoint/interceptor/productSchema.xsd
diff --git a/core/src/etc/test-resources/org/springframework/ws/endpoint/interceptor/schema.xsd b/core/src/test/resources/org/springframework/ws/endpoint/interceptor/schema.xsd
similarity index 100%
rename from core/src/etc/test-resources/org/springframework/ws/endpoint/interceptor/schema.xsd
rename to core/src/test/resources/org/springframework/ws/endpoint/interceptor/schema.xsd
diff --git a/core/src/etc/test-resources/org/springframework/ws/endpoint/interceptor/schema2.xsd b/core/src/test/resources/org/springframework/ws/endpoint/interceptor/schema2.xsd
similarity index 100%
rename from core/src/etc/test-resources/org/springframework/ws/endpoint/interceptor/schema2.xsd
rename to core/src/test/resources/org/springframework/ws/endpoint/interceptor/schema2.xsd
diff --git a/core/src/etc/test-resources/org/springframework/ws/endpoint/interceptor/sizeSchema.xsd b/core/src/test/resources/org/springframework/ws/endpoint/interceptor/sizeSchema.xsd
similarity index 100%
rename from core/src/etc/test-resources/org/springframework/ws/endpoint/interceptor/sizeSchema.xsd
rename to core/src/test/resources/org/springframework/ws/endpoint/interceptor/sizeSchema.xsd
diff --git a/core/src/etc/test-resources/org/springframework/ws/endpoint/interceptor/transformInput.xml b/core/src/test/resources/org/springframework/ws/endpoint/interceptor/transformInput.xml
similarity index 100%
rename from core/src/etc/test-resources/org/springframework/ws/endpoint/interceptor/transformInput.xml
rename to core/src/test/resources/org/springframework/ws/endpoint/interceptor/transformInput.xml
diff --git a/core/src/etc/test-resources/org/springframework/ws/endpoint/interceptor/transformOutput.xml b/core/src/test/resources/org/springframework/ws/endpoint/interceptor/transformOutput.xml
similarity index 100%
rename from core/src/etc/test-resources/org/springframework/ws/endpoint/interceptor/transformOutput.xml
rename to core/src/test/resources/org/springframework/ws/endpoint/interceptor/transformOutput.xml
diff --git a/core/src/etc/test-resources/org/springframework/ws/endpoint/interceptor/transformation.xslt b/core/src/test/resources/org/springframework/ws/endpoint/interceptor/transformation.xslt
similarity index 100%
rename from core/src/etc/test-resources/org/springframework/ws/endpoint/interceptor/transformation.xslt
rename to core/src/test/resources/org/springframework/ws/endpoint/interceptor/transformation.xslt
diff --git a/core/src/etc/test-resources/org/springframework/ws/endpoint/interceptor/validMessage.xml b/core/src/test/resources/org/springframework/ws/endpoint/interceptor/validMessage.xml
similarity index 100%
rename from core/src/etc/test-resources/org/springframework/ws/endpoint/interceptor/validMessage.xml
rename to core/src/test/resources/org/springframework/ws/endpoint/interceptor/validMessage.xml
diff --git a/core/src/etc/test-resources/org/springframework/ws/endpoint/interceptor/validSoapMessage.xml b/core/src/test/resources/org/springframework/ws/endpoint/interceptor/validSoapMessage.xml
similarity index 100%
rename from core/src/etc/test-resources/org/springframework/ws/endpoint/interceptor/validSoapMessage.xml
rename to core/src/test/resources/org/springframework/ws/endpoint/interceptor/validSoapMessage.xml
diff --git a/core/src/etc/test-resources/org/springframework/ws/payload.xml b/core/src/test/resources/org/springframework/ws/payload.xml
similarity index 100%
rename from core/src/etc/test-resources/org/springframework/ws/payload.xml
rename to core/src/test/resources/org/springframework/ws/payload.xml
diff --git a/core/src/etc/test-resources/org/springframework/ws/soap/context/soap11-attachment.bin b/core/src/test/resources/org/springframework/ws/soap/context/soap11-attachment.bin
similarity index 100%
rename from core/src/etc/test-resources/org/springframework/ws/soap/context/soap11-attachment.bin
rename to core/src/test/resources/org/springframework/ws/soap/context/soap11-attachment.bin
diff --git a/core/src/etc/test-resources/org/springframework/ws/soap/context/soap11.xml b/core/src/test/resources/org/springframework/ws/soap/context/soap11.xml
similarity index 100%
rename from core/src/etc/test-resources/org/springframework/ws/soap/context/soap11.xml
rename to core/src/test/resources/org/springframework/ws/soap/context/soap11.xml
diff --git a/core/src/etc/test-resources/org/springframework/ws/soap/context/soap12-attachment.bin b/core/src/test/resources/org/springframework/ws/soap/context/soap12-attachment.bin
similarity index 100%
rename from core/src/etc/test-resources/org/springframework/ws/soap/context/soap12-attachment.bin
rename to core/src/test/resources/org/springframework/ws/soap/context/soap12-attachment.bin
diff --git a/core/src/etc/test-resources/org/springframework/ws/soap/context/soap12.xml b/core/src/test/resources/org/springframework/ws/soap/context/soap12.xml
similarity index 100%
rename from core/src/etc/test-resources/org/springframework/ws/soap/context/soap12.xml
rename to core/src/test/resources/org/springframework/ws/soap/context/soap12.xml
diff --git a/core/src/etc/test-resources/org/springframework/ws/soap/saaj/support/soapMessage.xml b/core/src/test/resources/org/springframework/ws/soap/saaj/support/soapMessage.xml
similarity index 100%
rename from core/src/etc/test-resources/org/springframework/ws/soap/saaj/support/soapMessage.xml
rename to core/src/test/resources/org/springframework/ws/soap/saaj/support/soapMessage.xml
diff --git a/core/src/etc/test-resources/org/springframework/ws/soap/soap11/soap11.xsd b/core/src/test/resources/org/springframework/ws/soap/soap11/soap11.xsd
similarity index 100%
rename from core/src/etc/test-resources/org/springframework/ws/soap/soap11/soap11.xsd
rename to core/src/test/resources/org/springframework/ws/soap/soap11/soap11.xsd
diff --git a/core/src/etc/test-resources/org/springframework/ws/soap/soap12/soap12.xsd b/core/src/test/resources/org/springframework/ws/soap/soap12/soap12.xsd
similarity index 100%
rename from core/src/etc/test-resources/org/springframework/ws/soap/soap12/soap12.xsd
rename to core/src/test/resources/org/springframework/ws/soap/soap12/soap12.xsd
diff --git a/core/src/etc/test-resources/org/springframework/ws/soap/soap12/xml.xsd b/core/src/test/resources/org/springframework/ws/soap/soap12/xml.xsd
similarity index 100%
rename from core/src/etc/test-resources/org/springframework/ws/soap/soap12/xml.xsd
rename to core/src/test/resources/org/springframework/ws/soap/soap12/xml.xsd
diff --git a/core/src/etc/test-resources/org/springframework/ws/transport/http/wsdl11-expected.wsdl b/core/src/test/resources/org/springframework/ws/transport/http/wsdl11-expected.wsdl
similarity index 100%
rename from core/src/etc/test-resources/org/springframework/ws/transport/http/wsdl11-expected.wsdl
rename to core/src/test/resources/org/springframework/ws/transport/http/wsdl11-expected.wsdl
diff --git a/core/src/etc/test-resources/org/springframework/ws/transport/http/wsdl11-input.wsdl b/core/src/test/resources/org/springframework/ws/transport/http/wsdl11-input.wsdl
similarity index 100%
rename from core/src/etc/test-resources/org/springframework/ws/transport/http/wsdl11-input.wsdl
rename to core/src/test/resources/org/springframework/ws/transport/http/wsdl11-input.wsdl
diff --git a/core/src/etc/test-resources/org/springframework/ws/wsdl/wsdl11/abstract.wsdl b/core/src/test/resources/org/springframework/ws/wsdl/wsdl11/abstract.wsdl
similarity index 100%
rename from core/src/etc/test-resources/org/springframework/ws/wsdl/wsdl11/abstract.wsdl
rename to core/src/test/resources/org/springframework/ws/wsdl/wsdl11/abstract.wsdl
diff --git a/core/src/etc/test-resources/org/springframework/ws/wsdl/wsdl11/complete.wsdl b/core/src/test/resources/org/springframework/ws/wsdl/wsdl11/complete.wsdl
similarity index 100%
rename from core/src/etc/test-resources/org/springframework/ws/wsdl/wsdl11/complete.wsdl
rename to core/src/test/resources/org/springframework/ws/wsdl/wsdl11/complete.wsdl
diff --git a/core/src/etc/test-resources/org/springframework/ws/wsdl/wsdl11/concrete.wsdl b/core/src/test/resources/org/springframework/ws/wsdl/wsdl11/concrete.wsdl
similarity index 100%
rename from core/src/etc/test-resources/org/springframework/ws/wsdl/wsdl11/concrete.wsdl
rename to core/src/test/resources/org/springframework/ws/wsdl/wsdl11/concrete.wsdl
diff --git a/core/src/etc/test-resources/org/springframework/ws/wsdl/wsdl11/types.xsd b/core/src/test/resources/org/springframework/ws/wsdl/wsdl11/types.xsd
similarity index 100%
rename from core/src/etc/test-resources/org/springframework/ws/wsdl/wsdl11/types.xsd
rename to core/src/test/resources/org/springframework/ws/wsdl/wsdl11/types.xsd