diff --git a/test/hotspot/jtreg/runtime/locking/TestUnstructuredLocking.jasm b/test/hotspot/jtreg/runtime/locking/TestOutOfOrderUnlocking.jasm
similarity index 88%
rename from test/hotspot/jtreg/runtime/locking/TestUnstructuredLocking.jasm
rename to test/hotspot/jtreg/runtime/locking/TestOutOfOrderUnlocking.jasm
index 7e663f78ddc..99abbf6193a 100644
--- a/test/hotspot/jtreg/runtime/locking/TestUnstructuredLocking.jasm
+++ b/test/hotspot/jtreg/runtime/locking/TestOutOfOrderUnlocking.jasm
@@ -25,17 +25,17 @@
 /*
  * @test id=int
  * @summary Check that monitorenter A; monitorenter B; monitorexit A; monitorexit B; works
- * @compile TestUnstructuredLocking.jasm
- * @run main/othervm -Xint TestUnstructuredLocking
+ * @compile TestOutOfOrderUnlocking.jasm
+ * @run main/othervm -Xint TestOutOfOrderUnlocking
  */
 /*
  * @test id=comp
  * @summary Check that monitorenter A; monitorenter B; monitorexit A; monitorexit B; works, with -Xcomp
- * @compile TestUnstructuredLocking.jasm
- * @run main/othervm -Xcomp TestUnstructuredLocking
+ * @compile TestOutOfOrderUnlocking.jasm
+ * @run main/othervm -Xcomp TestOutOfOrderUnlocking
  */
 
-super public class TestUnstructuredLocking version 64:0 {
+super public class TestOutOfOrderUnlocking version 64:0 {
 
     public static Method main:"([Ljava/lang/String;)V" stack 2 locals 4 {
         new class java/lang/Object;