diff --git a/security/src/etc/test-resources/log4j.properties b/security/src/test/resources/log4j.properties
similarity index 100%
rename from security/src/etc/test-resources/log4j.properties
rename to security/src/test/resources/log4j.properties
diff --git a/security/src/etc/test-resources/org/springframework/ws/soap/security/xwss/callback/jaas/jaas.config b/security/src/test/resources/org/springframework/ws/soap/security/xwss/callback/jaas/jaas.config
similarity index 100%
rename from security/src/etc/test-resources/org/springframework/ws/soap/security/xwss/callback/jaas/jaas.config
rename to security/src/test/resources/org/springframework/ws/soap/security/xwss/callback/jaas/jaas.config
diff --git a/security/src/etc/test-resources/org/springframework/ws/soap/security/xwss/decrypt-config.xml b/security/src/test/resources/org/springframework/ws/soap/security/xwss/decrypt-config.xml
similarity index 100%
rename from security/src/etc/test-resources/org/springframework/ws/soap/security/xwss/decrypt-config.xml
rename to security/src/test/resources/org/springframework/ws/soap/security/xwss/decrypt-config.xml
diff --git a/security/src/etc/test-resources/org/springframework/ws/soap/security/xwss/empty-soap.xml b/security/src/test/resources/org/springframework/ws/soap/security/xwss/empty-soap.xml
similarity index 100%
rename from security/src/etc/test-resources/org/springframework/ws/soap/security/xwss/empty-soap.xml
rename to security/src/test/resources/org/springframework/ws/soap/security/xwss/empty-soap.xml
diff --git a/security/src/etc/test-resources/org/springframework/ws/soap/security/xwss/encrypt-alias-config.xml b/security/src/test/resources/org/springframework/ws/soap/security/xwss/encrypt-alias-config.xml
similarity index 100%
rename from security/src/etc/test-resources/org/springframework/ws/soap/security/xwss/encrypt-alias-config.xml
rename to security/src/test/resources/org/springframework/ws/soap/security/xwss/encrypt-alias-config.xml
diff --git a/security/src/etc/test-resources/org/springframework/ws/soap/security/xwss/encrypt-config.xml b/security/src/test/resources/org/springframework/ws/soap/security/xwss/encrypt-config.xml
similarity index 100%
rename from security/src/etc/test-resources/org/springframework/ws/soap/security/xwss/encrypt-config.xml
rename to security/src/test/resources/org/springframework/ws/soap/security/xwss/encrypt-config.xml
diff --git a/security/src/etc/test-resources/org/springframework/ws/soap/security/xwss/encrypted-soap.xml b/security/src/test/resources/org/springframework/ws/soap/security/xwss/encrypted-soap.xml
similarity index 100%
rename from security/src/etc/test-resources/org/springframework/ws/soap/security/xwss/encrypted-soap.xml
rename to security/src/test/resources/org/springframework/ws/soap/security/xwss/encrypted-soap.xml
diff --git a/security/src/etc/test-resources/org/springframework/ws/soap/security/xwss/requireSignature-config.xml b/security/src/test/resources/org/springframework/ws/soap/security/xwss/requireSignature-config.xml
similarity index 100%
rename from security/src/etc/test-resources/org/springframework/ws/soap/security/xwss/requireSignature-config.xml
rename to security/src/test/resources/org/springframework/ws/soap/security/xwss/requireSignature-config.xml
diff --git a/security/src/etc/test-resources/org/springframework/ws/soap/security/xwss/requireUsernameToken-digest-config.xml b/security/src/test/resources/org/springframework/ws/soap/security/xwss/requireUsernameToken-digest-config.xml
similarity index 100%
rename from security/src/etc/test-resources/org/springframework/ws/soap/security/xwss/requireUsernameToken-digest-config.xml
rename to security/src/test/resources/org/springframework/ws/soap/security/xwss/requireUsernameToken-digest-config.xml
diff --git a/security/src/etc/test-resources/org/springframework/ws/soap/security/xwss/requireUsernameToken-plainText-config.xml b/security/src/test/resources/org/springframework/ws/soap/security/xwss/requireUsernameToken-plainText-config.xml
similarity index 100%
rename from security/src/etc/test-resources/org/springframework/ws/soap/security/xwss/requireUsernameToken-plainText-config.xml
rename to security/src/test/resources/org/springframework/ws/soap/security/xwss/requireUsernameToken-plainText-config.xml
diff --git a/security/src/etc/test-resources/org/springframework/ws/soap/security/xwss/sign-alias-config.xml b/security/src/test/resources/org/springframework/ws/soap/security/xwss/sign-alias-config.xml
similarity index 100%
rename from security/src/etc/test-resources/org/springframework/ws/soap/security/xwss/sign-alias-config.xml
rename to security/src/test/resources/org/springframework/ws/soap/security/xwss/sign-alias-config.xml
diff --git a/security/src/etc/test-resources/org/springframework/ws/soap/security/xwss/sign-config.xml b/security/src/test/resources/org/springframework/ws/soap/security/xwss/sign-config.xml
similarity index 100%
rename from security/src/etc/test-resources/org/springframework/ws/soap/security/xwss/sign-config.xml
rename to security/src/test/resources/org/springframework/ws/soap/security/xwss/sign-config.xml
diff --git a/security/src/etc/test-resources/org/springframework/ws/soap/security/xwss/signed-soap.xml b/security/src/test/resources/org/springframework/ws/soap/security/xwss/signed-soap.xml
similarity index 100%
rename from security/src/etc/test-resources/org/springframework/ws/soap/security/xwss/signed-soap.xml
rename to security/src/test/resources/org/springframework/ws/soap/security/xwss/signed-soap.xml
diff --git a/security/src/etc/test-resources/org/springframework/ws/soap/security/xwss/test-keystore.jks b/security/src/test/resources/org/springframework/ws/soap/security/xwss/test-keystore.jks
similarity index 100%
rename from security/src/etc/test-resources/org/springframework/ws/soap/security/xwss/test-keystore.jks
rename to security/src/test/resources/org/springframework/ws/soap/security/xwss/test-keystore.jks
diff --git a/security/src/etc/test-resources/org/springframework/ws/soap/security/xwss/test-truststore.jks b/security/src/test/resources/org/springframework/ws/soap/security/xwss/test-truststore.jks
similarity index 100%
rename from security/src/etc/test-resources/org/springframework/ws/soap/security/xwss/test-truststore.jks
rename to security/src/test/resources/org/springframework/ws/soap/security/xwss/test-truststore.jks
diff --git a/security/src/etc/test-resources/org/springframework/ws/soap/security/xwss/usernameToken-digest-config.xml b/security/src/test/resources/org/springframework/ws/soap/security/xwss/usernameToken-digest-config.xml
similarity index 100%
rename from security/src/etc/test-resources/org/springframework/ws/soap/security/xwss/usernameToken-digest-config.xml
rename to security/src/test/resources/org/springframework/ws/soap/security/xwss/usernameToken-digest-config.xml
diff --git a/security/src/etc/test-resources/org/springframework/ws/soap/security/xwss/usernameToken-plainText-config.xml b/security/src/test/resources/org/springframework/ws/soap/security/xwss/usernameToken-plainText-config.xml
similarity index 100%
rename from security/src/etc/test-resources/org/springframework/ws/soap/security/xwss/usernameToken-plainText-config.xml
rename to security/src/test/resources/org/springframework/ws/soap/security/xwss/usernameToken-plainText-config.xml
diff --git a/security/src/etc/test-resources/org/springframework/ws/soap/security/xwss/usernameTokenDigest-soap.xml b/security/src/test/resources/org/springframework/ws/soap/security/xwss/usernameTokenDigest-soap.xml
similarity index 100%
rename from security/src/etc/test-resources/org/springframework/ws/soap/security/xwss/usernameTokenDigest-soap.xml
rename to security/src/test/resources/org/springframework/ws/soap/security/xwss/usernameTokenDigest-soap.xml
diff --git a/security/src/etc/test-resources/org/springframework/ws/soap/security/xwss/usernameTokenPlainText-soap.xml b/security/src/test/resources/org/springframework/ws/soap/security/xwss/usernameTokenPlainText-soap.xml
similarity index 100%
rename from security/src/etc/test-resources/org/springframework/ws/soap/security/xwss/usernameTokenPlainText-soap.xml
rename to security/src/test/resources/org/springframework/ws/soap/security/xwss/usernameTokenPlainText-soap.xml