diff --git a/tests/php/Security/PasswordValidatorTest.php b/tests/php/Security/PasswordValidatorTest.php
index 4fd99ed08..7fa5637ab 100644
--- a/tests/php/Security/PasswordValidatorTest.php
+++ b/tests/php/Security/PasswordValidatorTest.php
@@ -2,9 +2,9 @@
 
 namespace SilverStripe\Security\Tests;
 
-use SilverStripe\Security\PasswordValidator;
-use SilverStripe\Security\Member;
 use SilverStripe\Dev\SapphireTest;
+use SilverStripe\Security\Member;
+use SilverStripe\Security\PasswordValidator;
 
 class PasswordValidatorTest extends SapphireTest
 {
@@ -14,6 +14,16 @@ class PasswordValidatorTest extends SapphireTest
      */
     protected $usesDatabase = true;
 
+    protected function setUp()
+    {
+        parent::setUp();
+
+        // Unset framework default values
+        PasswordValidator::config()
+            ->remove('min_length')
+            ->remove('historic_count');
+    }
+
     public function testValidate()
     {
         $v = new PasswordValidator();