diff --git a/core/src/test/java/org/acegisecurity/providers/encoding/Md5PasswordEncoderTest.java b/core/src/test/java/org/acegisecurity/providers/encoding/Md5PasswordEncoderTest.java
deleted file mode 100644
index 9633c3d4d0..0000000000
--- a/core/src/test/java/org/acegisecurity/providers/encoding/Md5PasswordEncoderTest.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/* Copyright 2004 Acegi Technology Pty Limited
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.sf.acegisecurity.providers.encoding;
-
-import junit.framework.TestCase;
-
-/**
- * <p>
- * TestCase for PlaintextPasswordEncoder.
- * </p>
- *
- * @author colin sampaleanu
- * @version $Id$
- */
-public class Md5PasswordEncoderTest extends TestCase {
-    //~ Methods ================================================================
-
-    public void testBasicFunctionality() {
-        Md5PasswordEncoder pe = new Md5PasswordEncoder();
-        String raw = "abc123";
-        String badRaw = "abc321";
-        String encoded = pe.encodePassword(raw, null); // no SALT source
-        assertTrue(pe.isPasswordValid(encoded, raw, null));
-        assertFalse(pe.isPasswordValid(encoded, badRaw, null));
-        assertTrue(encoded.length() == 32);
-
-        // now try Base64
-        pe.setEncodeHashAsBase64(true);
-        encoded = pe.encodePassword(raw, null); // no SALT source
-        assertTrue(pe.isPasswordValid(encoded, raw, null));
-        assertFalse(pe.isPasswordValid(encoded, badRaw, null));
-        assertTrue(encoded.length() != 32);
-    }
-}
diff --git a/core/src/test/java/org/acegisecurity/providers/encoding/PlaintextPasswordEncoderTest.java b/core/src/test/java/org/acegisecurity/providers/encoding/PlaintextPasswordEncoderTest.java
deleted file mode 100644
index 47e6b9ae80..0000000000
--- a/core/src/test/java/org/acegisecurity/providers/encoding/PlaintextPasswordEncoderTest.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/* Copyright 2004 Acegi Technology Pty Limited
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.sf.acegisecurity.providers.encoding;
-
-import junit.framework.TestCase;
-
-/**
- * <p>
- * TestCase for PlaintextPasswordEncoder.
- * </p>
- *
- * @author colin sampaleanu
- * @version $Id$
- */
-public class PlaintextPasswordEncoderTest extends TestCase {
-    //~ Methods ================================================================
-
-    public void testBasicFunctionality() {
-        PlaintextPasswordEncoder pe = new PlaintextPasswordEncoder();
-
-        String raw = "abc123";
-        String rawDiffCase = "AbC123";
-        String badRaw = "abc321";
-
-        // should be able to validate even without encoding
-        String encoded = raw;
-        assertTrue(pe.isPasswordValid(encoded, raw, null)); // no SALT source
-        assertFalse(pe.isPasswordValid(encoded, badRaw, null));
-
-        // now make sure encoded version it gives us back is comparable as well
-        encoded = pe.encodePassword(raw, null);
-        assertTrue(pe.isPasswordValid(encoded, raw, null)); // no SALT source
-        assertFalse(pe.isPasswordValid(encoded, badRaw, null));
-
-        // make sure default is not to ignore password case
-        encoded = pe.encodePassword(rawDiffCase, null);
-        assertFalse(pe.isPasswordValid(encoded, raw, null));
-
-        // now check for ignore password case
-        pe = new PlaintextPasswordEncoder();
-        pe.setIgnorePasswordCase(true);
-
-        // should be able to validate even without encoding
-        encoded = pe.encodePassword(rawDiffCase, null);
-        assertTrue(pe.isPasswordValid(encoded, raw, null));
-        assertFalse(pe.isPasswordValid(encoded, badRaw, null));
-    }
-}
diff --git a/core/src/test/java/org/acegisecurity/providers/encoding/ShaPasswordEncoderTest.java b/core/src/test/java/org/acegisecurity/providers/encoding/ShaPasswordEncoderTest.java
deleted file mode 100644
index 94007af18c..0000000000
--- a/core/src/test/java/org/acegisecurity/providers/encoding/ShaPasswordEncoderTest.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/* Copyright 2004 Acegi Technology Pty Limited
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.sf.acegisecurity.providers.encoding;
-
-import junit.framework.TestCase;
-
-
-/**
- * <p>
- * TestCase for ShaPasswordEncoder.
- * </p>
- *
- * @author colin sampaleanu
- * @version $Id$
- */
-public class ShaPasswordEncoderTest extends TestCase {
-    //~ Methods ================================================================
-
-    public void testBasicFunctionality() {
-        ShaPasswordEncoder pe = new ShaPasswordEncoder();
-        String raw = "abc123";
-        String badRaw = "abc321";
-        String encoded = pe.encodePassword(raw, null); // no SALT source
-        assertTrue(pe.isPasswordValid(encoded, raw, null));
-        assertFalse(pe.isPasswordValid(encoded, badRaw, null));
-        assertTrue(encoded.length() == 40);
-
-        // now try Base64
-        pe.setEncodeHashAsBase64(true);
-        encoded = pe.encodePassword(raw, null); // no SALT source
-        assertTrue(pe.isPasswordValid(encoded, raw, null));
-        assertFalse(pe.isPasswordValid(encoded, badRaw, null));
-        assertTrue(encoded.length() != 40);
-    }
-}