--- old/test/java/rmi/activation/Activatable/nonExistentActivatable/NonExistentActivatable.java	2016-09-27 02:08:08.293983916 -0700
+++ new/test/java/rmi/activation/Activatable/nonExistentActivatable/NonExistentActivatable.java	2016-09-27 02:08:08.034113911 -0700
@@ -22,7 +22,7 @@
  */
 
 /* @test
- * @bug 4115296
+ * @bug 4115296 8085192
  * @summary synopsis: NoSuchObjectException not thrown for non-existent
  * activatable objects
  * @author Ann Wollrath
@@ -90,9 +90,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