diff --git a/pom.xml b/pom.xml
index f8a502ca5..50f1a9656 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci</groupId>
     <artifactId>jenkins</artifactId>
-    <version>1.36</version>
+    <version>1.37</version>
   </parent>
 
   <groupId>org.jenkins-ci.main</groupId>
@@ -47,7 +47,10 @@ THE SOFTWARE.
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <jetty.version>9.2.15.v20160210</jetty.version>
+    <jetty.version>9.4.5.v20170502</jetty.version>
+    <maven-surefire-plugin.version>2.20</maven-surefire-plugin.version>
+    <maven-compiler-plugin.version>3.6.1</maven-compiler-plugin.version>
+    <java.level>8</java.level>
   </properties>
 
   <licenses>
diff --git a/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java b/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java
index 401bba3fe..4f1da49c1 100644
--- a/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java
+++ b/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java
@@ -130,6 +130,7 @@
 import org.eclipse.jetty.http.MimeTypes;
 import org.eclipse.jetty.security.HashLoginService;
 import org.eclipse.jetty.security.LoginService;
+import org.eclipse.jetty.security.UserStore;
 import org.eclipse.jetty.server.HttpConfiguration;
 import org.eclipse.jetty.server.HttpConnectionFactory;
 import org.eclipse.jetty.server.Server;
@@ -551,9 +552,11 @@ public Thread newThread(Runnable r) {
     protected LoginService configureUserRealm() {
         HashLoginService realm = new HashLoginService();
         realm.setName("default");   // this is the magic realm name to make it effective on everywhere
-        realm.update("alice", new Password("alice"), new String[]{"user","female"});
-        realm.update("bob", new Password("bob"), new String[]{"user","male"});
-        realm.update("charlie", new Password("charlie"), new String[]{"user","male"});
+        UserStore userStore = new UserStore();
+        realm.setUserStore( userStore );
+        userStore.addUser("alice", new Password("alice"), new String[]{"user","female"});
+        userStore.addUser("bob", new Password("bob"), new String[]{"user","male"});
+        userStore.addUser("charlie", new Password("charlie"), new String[]{"user","male"});
 
         return realm;
     }
diff --git a/src/main/java/org/jvnet/hudson/test/JenkinsRule.java b/src/main/java/org/jvnet/hudson/test/JenkinsRule.java
index 727f9f61e..5939d4403 100644
--- a/src/main/java/org/jvnet/hudson/test/JenkinsRule.java
+++ b/src/main/java/org/jvnet/hudson/test/JenkinsRule.java
@@ -183,6 +183,7 @@
 import org.eclipse.jetty.http.MimeTypes;
 import org.eclipse.jetty.security.HashLoginService;
 import org.eclipse.jetty.security.LoginService;
+import org.eclipse.jetty.security.UserStore;
 import org.eclipse.jetty.server.HttpConfiguration;
 import org.eclipse.jetty.server.HttpConnectionFactory;
 import org.eclipse.jetty.server.Server;
@@ -685,9 +686,11 @@ public Thread newThread(Runnable r) {
     protected LoginService configureUserRealm() {
         HashLoginService realm = new HashLoginService();
         realm.setName("default");   // this is the magic realm name to make it effective on everywhere
-        realm.update("alice", new Password("alice"), new String[]{"user","female"});
-        realm.update("bob", new Password("bob"), new String[]{"user","male"});
-        realm.update("charlie", new Password("charlie"), new String[]{"user","male"});
+        UserStore userStore = new UserStore();
+        realm.setUserStore( userStore );
+        userStore.addUser("alice", new Password("alice"), new String[]{"user","female"});
+        userStore.addUser("bob", new Password("bob"), new String[]{"user","male"});
+        userStore.addUser("charlie", new Password("charlie"), new String[]{"user","male"});
 
         return realm;
     }