--- a/test/hotspot/jtreg/runtime/RedefineTests/RedefineInterfaceMethods.java	Fri Jun 22 17:49:21 2018 -0700
+++ b/test/hotspot/jtreg/runtime/RedefineTests/RedefineInterfaceMethods.java	Sat Jun 23 01:32:41 2018 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 8081800
+ * @bug 8081800 8010319
  * @summary Redefine private and default interface methods
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
@@ -33,23 +33,27 @@
  * @run main RedefineClassHelper
  * @run main/othervm -javaagent:redefineagent.jar -Xlog:redefine+class*=trace RedefineInterfaceMethods
  */
+
+// package access top-level class to avoid problem with RedefineClassHelper
+// and nested types.
+
+interface RedefineInterfaceMethods_B {
+    int ORIGINAL_RETURN = 1;
+    int NEW_RETURN = 2;
+    private int privateMethod() {
+        return ORIGINAL_RETURN;
+    }
+    public default int defaultMethod() {
+        return privateMethod();
+    }
+}
+
 public class RedefineInterfaceMethods {
 
     static final int RET = -2;
 
-    static interface B {
-        int ORIGINAL_RETURN = 1;
-        int NEW_RETURN = 2;
-        private int privateMethod() {
-            return ORIGINAL_RETURN;
-        }
-        public default int defaultMethod() {
-            return privateMethod();
-        }
-    }
-
     public static String redefinedPrivateMethod =
-        "interface RedefineInterfaceMethods$B {" +
+        "interface RedefineInterfaceMethods_B {" +
         "    int ORIGINAL_RETURN = 1;" +
         "    int NEW_RETURN = 2;" +
         "    private int privateMethod() {" +
@@ -61,7 +65,7 @@
         "}";
 
     public static String redefinedDefaultMethod =
-        "interface RedefineInterfaceMethods$B {" +
+        "interface RedefineInterfaceMethods_B {" +
         "    int ORIGINAL_RETURN = 1;" +
         "    int NEW_RETURN = 2;" +
         "    private int privateMethod() {" +
@@ -72,7 +76,7 @@
         "    }" +
         "}";
 
-    static class Impl implements B {
+    static class Impl implements RedefineInterfaceMethods_B {
     }
 
 
@@ -81,20 +85,20 @@
         Impl impl = new Impl();
 
         int res = impl.defaultMethod();
-        if (res != B.ORIGINAL_RETURN)
+        if (res != RedefineInterfaceMethods_B.ORIGINAL_RETURN)
             throw new Error("defaultMethod returned " + res +
-                            " expected " + B.ORIGINAL_RETURN);
+                            " expected " + RedefineInterfaceMethods_B.ORIGINAL_RETURN);
 
-        RedefineClassHelper.redefineClass(B.class, redefinedPrivateMethod);
+        RedefineClassHelper.redefineClass(RedefineInterfaceMethods_B.class, redefinedPrivateMethod);
 
         res = impl.defaultMethod();
-        if (res != B.NEW_RETURN)
+        if (res != RedefineInterfaceMethods_B.NEW_RETURN)
             throw new Error("defaultMethod returned " + res +
-                            " expected " + B.NEW_RETURN);
+                            " expected " + RedefineInterfaceMethods_B.NEW_RETURN);
 
         System.gc();
 
-        RedefineClassHelper.redefineClass(B.class, redefinedDefaultMethod);
+        RedefineClassHelper.redefineClass(RedefineInterfaceMethods_B.class, redefinedDefaultMethod);
 
         res = impl.defaultMethod();
         if (res != RET)