diff --git a/test/jdk/java/lang/invoke/t8150782/TestAccessClass.java b/test/jdk/java/lang/invoke/accessClassAndFindClass/TestAccessClass.java
similarity index 96%
rename from test/jdk/java/lang/invoke/t8150782/TestAccessClass.java
rename to test/jdk/java/lang/invoke/accessClassAndFindClass/TestAccessClass.java
index 08117e54b19..e75cf8541e6 100644
--- a/test/jdk/java/lang/invoke/t8150782/TestAccessClass.java
+++ b/test/jdk/java/lang/invoke/accessClassAndFindClass/TestAccessClass.java
@@ -26,9 +26,9 @@
 /* @test
  * @bug 8150782 8207027 8266269
  * @compile TestAccessClass.java TestCls.java p/Foo.java q/Bar.java
- * @run testng/othervm -ea -esa test.java.lang.invoke.t8150782.TestAccessClass
+ * @run testng/othervm -ea -esa test.java.lang.invoke.TestAccessClass
  */
-package test.java.lang.invoke.t8150782;
+package test.java.lang.invoke;
 
 import java.lang.invoke.*;
 import java.lang.reflect.Modifier;
diff --git a/test/jdk/java/lang/invoke/t8150782/TestCls.java b/test/jdk/java/lang/invoke/accessClassAndFindClass/TestCls.java
similarity index 97%
rename from test/jdk/java/lang/invoke/t8150782/TestCls.java
rename to test/jdk/java/lang/invoke/accessClassAndFindClass/TestCls.java
index 1aec2657d0a..c46aef619fa 100644
--- a/test/jdk/java/lang/invoke/t8150782/TestCls.java
+++ b/test/jdk/java/lang/invoke/accessClassAndFindClass/TestCls.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package test.java.lang.invoke.t8150782;
+package test.java.lang.invoke;
 
 import static java.lang.invoke.MethodHandles.*;
 
diff --git a/test/jdk/java/lang/invoke/t8150782/TestFindClass.java b/test/jdk/java/lang/invoke/accessClassAndFindClass/TestFindClass.java
similarity index 96%
rename from test/jdk/java/lang/invoke/t8150782/TestFindClass.java
rename to test/jdk/java/lang/invoke/accessClassAndFindClass/TestFindClass.java
index a023781cecb..d30f48de6ad 100644
--- a/test/jdk/java/lang/invoke/t8150782/TestFindClass.java
+++ b/test/jdk/java/lang/invoke/accessClassAndFindClass/TestFindClass.java
@@ -26,9 +26,9 @@
 /* @test
  * @bug 8150782 8207027 8266269
  * @compile TestFindClass.java TestCls.java p/Foo.java q/Bar.java
- * @run testng/othervm -ea -esa test.java.lang.invoke.t8150782.TestFindClass
+ * @run testng/othervm -ea -esa test.java.lang.invoke.TestFindClass
  */
-package test.java.lang.invoke.t8150782;
+package test.java.lang.invoke;
 
 import java.lang.invoke.*;
 import p.Foo;
@@ -42,7 +42,7 @@ import org.testng.annotations.*;
 
 public class TestFindClass {
 
-    private static final String PACKAGE_PREFIX = "test.java.lang.invoke.t8150782.";
+    private static final String PACKAGE_PREFIX = "test.java.lang.invoke.";
 
     private static boolean initializedClass1;
 
diff --git a/test/jdk/java/lang/invoke/t8150782/TestLookup.java b/test/jdk/java/lang/invoke/accessClassAndFindClass/TestLookup.java
similarity index 93%
rename from test/jdk/java/lang/invoke/t8150782/TestLookup.java
rename to test/jdk/java/lang/invoke/accessClassAndFindClass/TestLookup.java
index 1d49959cbc9..fbb976e3401 100644
--- a/test/jdk/java/lang/invoke/t8150782/TestLookup.java
+++ b/test/jdk/java/lang/invoke/accessClassAndFindClass/TestLookup.java
@@ -25,9 +25,9 @@
 
 /* @test
  * @compile TestLookup.java TestCls.java
- * @run testng/othervm -ea -esa test.java.lang.invoke.t8150782.TestLookup
+ * @run testng/othervm -ea -esa test.java.lang.invoke.TestLookup
  */
-package test.java.lang.invoke.t8150782;
+package test.java.lang.invoke;
 
 import org.testng.annotations.Test;
 
@@ -48,7 +48,7 @@ public class TestLookup {
     @Test(expectedExceptions = {ClassNotFoundException.class})
     public void testPublicCannotLoadUserClass() throws IllegalAccessException, ClassNotFoundException {
         Lookup lookup = publicLookup();
-        lookup.findClass("test.java.lang.invoke.t8150782.TestCls");
+        lookup.findClass("test.java.lang.invoke.TestCls");
     }
 
     @Test
diff --git a/test/jdk/java/lang/invoke/t8150782/p/Foo.java b/test/jdk/java/lang/invoke/accessClassAndFindClass/p/Foo.java
similarity index 100%
rename from test/jdk/java/lang/invoke/t8150782/p/Foo.java
rename to test/jdk/java/lang/invoke/accessClassAndFindClass/p/Foo.java
diff --git a/test/jdk/java/lang/invoke/t8150782/q/Bar.java b/test/jdk/java/lang/invoke/accessClassAndFindClass/q/Bar.java
similarity index 100%
rename from test/jdk/java/lang/invoke/t8150782/q/Bar.java
rename to test/jdk/java/lang/invoke/accessClassAndFindClass/q/Bar.java