--- old/test/java/rmi/activation/Activatable/nestedActivate/NestedActivate.java	2016-09-27 02:08:07.461400401 -0700
+++ new/test/java/rmi/activation/Activatable/nestedActivate/NestedActivate.java	2016-09-27 02:08:07.221520397 -0700
@@ -22,7 +22,7 @@
  */
 
 /* @test
- * @bug 4138056
+ * @bug 4138056 8085192
  * @summary synopsis: Activating objects from an Activatable constructor causes deadlock
  * @author Ann Wollrath
  *
@@ -100,10 +100,7 @@
         RMID rmid = null;
 
         try {
-            RMID.removeLog();
-            rmid = RMID.createRMID();
-            rmid.start();
-
+            rmid = RMID.launch();
             /* Cause activation groups to have a security policy that will
              * allow security managers to be downloaded and installed
              */