diff --git a/test/src/test/java/hudson/model/NodeTest.java b/test/src/test/java/hudson/model/NodeTest.java
index c24d45913ddab27290d621a479e8410d3fb56311..7dd06ace79751a4b4ba0fbc60f834ed03bb48516 100644
--- a/test/src/test/java/hudson/model/NodeTest.java
+++ b/test/src/test/java/hudson/model/NodeTest.java
@@ -209,8 +209,7 @@ public class NodeTest {
         j.jenkins.setCrumbIssuer(null);
         HudsonPrivateSecurityRealm realm = new HudsonPrivateSecurityRealm(false);
         j.jenkins.setSecurityRealm(realm);
-        User user = User.get("John Smith");
-
+        User user = realm.createAccount("John Smith","abcdef");
         SecurityContextHolder.getContext().setAuthentication(user.impersonate());
         assertFalse("Current user should not have permission read.", node.hasPermission(Permission.READ));
         auth.add(Computer.CONFIGURE, user.getId());
diff --git a/test/src/test/java/hudson/model/ProjectTest.java b/test/src/test/java/hudson/model/ProjectTest.java
index 3bd48e4972ffedecdfd06d5490226d491cb797e0..8cabb8dffdf8b75bb6580c36d871f59668b29b4a 100644
--- a/test/src/test/java/hudson/model/ProjectTest.java
+++ b/test/src/test/java/hudson/model/ProjectTest.java
@@ -492,14 +492,14 @@ public class ProjectTest {
     
     @Test
     public void testDoCancelQueue() throws Exception{
-        User user = User.get("John Smith", true, Collections.emptyMap());
         FreeStyleProject project = j.createFreeStyleProject("project");
         GlobalMatrixAuthorizationStrategy auth = new GlobalMatrixAuthorizationStrategy();   
         j.jenkins.setAuthorizationStrategy(auth);
         j.jenkins.setCrumbIssuer(null);
         HudsonPrivateSecurityRealm realm = new HudsonPrivateSecurityRealm(false);
         j.jenkins.setSecurityRealm(realm); 
-        SecurityContextHolder.getContext().setAuthentication(user.impersonate()); 
+        User user = realm.createAccount("John Smith", "password");
+        SecurityContextHolder.getContext().setAuthentication(user.impersonate());
         try{
             project.doCancelQueue(null, null);
             fail("User should not have permission to build project");
diff --git a/test/src/test/java/hudson/model/UserTest.java b/test/src/test/java/hudson/model/UserTest.java
index a8f37057a49fc0aebd7f328821bd2dfd9a7eb244..3f91ecb4737ae17796fdf687d3ed11718ab915ca 100644
--- a/test/src/test/java/hudson/model/UserTest.java
+++ b/test/src/test/java/hudson/model/UserTest.java
@@ -404,8 +404,8 @@ public class UserTest {
         j.jenkins.setCrumbIssuer(null);
         HudsonPrivateSecurityRealm realm = new HudsonPrivateSecurityRealm(false);
         j.jenkins.setSecurityRealm(realm);
-        User user = User.get("John Smith");
-        User user2 = User.get("John Smith2");
+        User user = realm.createAccount("John Smith","password");
+        User user2 = realm.createAccount("John Smith2","password");
         user2.save();
         SecurityContextHolder.getContext().setAuthentication(user.impersonate());
         assertFalse("User should not be able delete because he does not have administer permission.", user2.canDelete());