diff --git a/core/src/main/java/org/springframework/security/core/userdetails/memory/UserMapEditor.java b/core/src/main/java/org/springframework/security/core/userdetails/memory/UserMapEditor.java
index 2e531fa836..ce1873e76c 100644
--- a/core/src/main/java/org/springframework/security/core/userdetails/memory/UserMapEditor.java
+++ b/core/src/main/java/org/springframework/security/core/userdetails/memory/UserMapEditor.java
@@ -41,6 +41,7 @@ import java.util.Properties;
  *
  * @author Ben Alex
  */
+@SuppressWarnings("deprecation")
 public class UserMapEditor extends PropertyEditorSupport {
     //~ Methods ========================================================================================================
 
diff --git a/core/src/test/java/org/springframework/security/core/userdetails/memory/UserMapEditorTests.java b/core/src/test/java/org/springframework/security/core/userdetails/memory/UserMapEditorTests.java
index 114a3a267b..a7cd2fa6f9 100644
--- a/core/src/test/java/org/springframework/security/core/userdetails/memory/UserMapEditorTests.java
+++ b/core/src/test/java/org/springframework/security/core/userdetails/memory/UserMapEditorTests.java
@@ -27,6 +27,7 @@ import org.springframework.security.core.userdetails.memory.UserMapEditor;
  *
  * @author Ben Alex
  */
+@SuppressWarnings("deprecation")
 public class UserMapEditorTests extends TestCase {
     //~ Constructors ===================================================================================================
 
diff --git a/core/src/test/java/org/springframework/security/core/userdetails/memory/UserMapTests.java b/core/src/test/java/org/springframework/security/core/userdetails/memory/UserMapTests.java
index 94924f1b79..3526b53478 100644
--- a/core/src/test/java/org/springframework/security/core/userdetails/memory/UserMapTests.java
+++ b/core/src/test/java/org/springframework/security/core/userdetails/memory/UserMapTests.java
@@ -29,6 +29,7 @@ import org.springframework.security.core.userdetails.UsernameNotFoundException;
  *
  * @author Ben Alex
  */
+@SuppressWarnings("deprecation")
 public class UserMapTests {
 
     @Test
diff --git a/web/src/test/java/org/springframework/security/web/authentication/www/DigestAuthenticationFilterTests.java b/web/src/test/java/org/springframework/security/web/authentication/www/DigestAuthenticationFilterTests.java
index 2116d1d24b..8ea80060ff 100644
--- a/web/src/test/java/org/springframework/security/web/authentication/www/DigestAuthenticationFilterTests.java
+++ b/web/src/test/java/org/springframework/security/web/authentication/www/DigestAuthenticationFilterTests.java
@@ -51,6 +51,7 @@ import org.springframework.util.StringUtils;
  * @author Ben Alex
  * @author Luke Taylor
  */
+@SuppressWarnings("deprecation")
 public class DigestAuthenticationFilterTests {
     //~ Static fields/initializers =====================================================================================