diff --git a/test/hotspot/jtreg/vmTestbase/vm/mlvm/TEST.properties b/test/hotspot/jtreg/vmTestbase/vm/mlvm/TEST.properties
deleted file mode 100644
index 9bb2e2c8771..00000000000
--- a/test/hotspot/jtreg/vmTestbase/vm/mlvm/TEST.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-# disabled till JDK-8251997 is fixed
-allowSmartActionArgs=false
diff --git a/test/hotspot/jtreg/vmTestbase/vm/mlvm/indy/func/jdi/breakpoint/Test.java b/test/hotspot/jtreg/vmTestbase/vm/mlvm/indy/func/jdi/breakpoint/Test.java
index c4bf7c8354b..b564798d3a5 100644
--- a/test/hotspot/jtreg/vmTestbase/vm/mlvm/indy/func/jdi/breakpoint/Test.java
+++ b/test/hotspot/jtreg/vmTestbase/vm/mlvm/indy/func/jdi/breakpoint/Test.java
@@ -21,7 +21,6 @@
  * questions.
  */
 
-
 /*
  * @test
  *
@@ -43,7 +42,7 @@
  * @build vm.mlvm.indy.func.jdi.breakpoint.Test
  * @run driver vm.mlvm.share.IndifiedClassesBuilder
  *
- * @run main/othervm PropertyResolvingWrapper
+ * @run main/othervm
  *      vm.mlvm.indy.func.jdi.breakpoint.Test
  *      -verbose
  *      -arch=${os.family}-${os.simpleArch}
@@ -75,10 +74,10 @@ public class Test extends JDIBreakpointTest {
         result.add(new BreakpointInfo("bootstrap"));
         result.add(new BreakpointInfo("target"));
         result.add(new BreakpointInfo("stop"));
+
         return result;
     }
 
-
     public static void main(String[] args) {
         launch(new ArgumentHandler(args));
     }
diff --git a/test/hotspot/jtreg/vmTestbase/vm/mlvm/indy/func/jdi/breakpointOtherStratum/Test.java b/test/hotspot/jtreg/vmTestbase/vm/mlvm/indy/func/jdi/breakpointOtherStratum/Test.java
index 0e7bcc3fb0b..2c14968bc01 100644
--- a/test/hotspot/jtreg/vmTestbase/vm/mlvm/indy/func/jdi/breakpointOtherStratum/Test.java
+++ b/test/hotspot/jtreg/vmTestbase/vm/mlvm/indy/func/jdi/breakpointOtherStratum/Test.java
@@ -21,7 +21,6 @@
  * questions.
  */
 
-
 /*
  * @test
  *
@@ -49,7 +48,7 @@
  *      vm.mlvm.share.StratumClassesBuilder
  *      vmTestbase/vm/mlvm/share/jpda/INDIFY_SDE_DebuggeeBase.java
  *
- * @run main/othervm PropertyResolvingWrapper
+ * @run main/othervm
  *      vm.mlvm.indy.func.jdi.breakpointOtherStratum.Test
  *      -verbose
  *      -arch=${os.family}-${os.simpleArch}
@@ -71,7 +70,6 @@ import java.util.ArrayList;
 import java.util.List;
 
 public class Test extends JDIBreakpointTest {
-
     @Override
     protected List<BreakpointInfo> getBreakpoints(String debuggeeClassName) {
         List<BreakpointInfo> result = new ArrayList<>();
@@ -100,6 +98,7 @@ public class Test extends JDIBreakpointTest {
             info.stratumInfo = new StratumInfo("Logo", "INDIFY_SDE_DebuggeeBase.logo", 5);
             result.add(info);
         }
+
         return result;
     }
 
diff --git a/test/hotspot/jtreg/vmTestbase/vm/mlvm/indy/stress/jdi/breakpointInCompiledCode/Test.java b/test/hotspot/jtreg/vmTestbase/vm/mlvm/indy/stress/jdi/breakpointInCompiledCode/Test.java
index 7def75a25fe..5d43b7838e1 100644
--- a/test/hotspot/jtreg/vmTestbase/vm/mlvm/indy/stress/jdi/breakpointInCompiledCode/Test.java
+++ b/test/hotspot/jtreg/vmTestbase/vm/mlvm/indy/stress/jdi/breakpointInCompiledCode/Test.java
@@ -21,7 +21,6 @@
  * questions.
  */
 
-
 /*
  * @test
  *
@@ -29,7 +28,8 @@
  * VM Testbase keywords: [feature_mlvm, nonconcurrent, fds, jdk]
  * VM Testbase readme:
  * DESCRIPTION
- *     Execute an invokedynamic instruction 10000 times to trigger Hotspot compilation. Set a debugger breakpoint to invokedynamic instruction.
+ *     Execute an invokedynamic instruction 10000 times to trigger Hotspot compilation.
+ *     Set a debugger breakpoint to invokedynamic instruction.
  *     Make few debugger steps, obtaining various information from JVM
  *
  * @library /vmTestbase
@@ -42,7 +42,7 @@
  * @build vm.mlvm.indy.stress.jdi.breakpointInCompiledCode.Test
  * @run driver vm.mlvm.share.IndifiedClassesBuilder
  *
- * @run main/othervm PropertyResolvingWrapper
+ * @run main/othervm
  *      vm.mlvm.indy.stress.jdi.breakpointInCompiledCode.Test
  *      -verbose
  *      -arch=${os.family}-${os.simpleArch}
@@ -64,9 +64,9 @@ import java.util.ArrayList;
 import java.util.List;
 
 public class Test extends JDIBreakpointTest {
-    //  bootstrap,runDebuggee=>(indyWrapper:S5000,~target,stop)
+    // bootstrap,runDebuggee=>(indyWrapper:S5000,~target,stop)
     @Override
-    protected List<BreakpointInfo> getBreakpoints(String debuggeeClassName)  {
+    protected List<BreakpointInfo> getBreakpoints(String debuggeeClassName) {
         List<BreakpointInfo> result = new ArrayList<>();
         result.add(new BreakpointInfo("bootstrap"));
         {
@@ -88,6 +88,7 @@ public class Test extends JDIBreakpointTest {
             info.subBreakpoints = subBreakpoints;
             result.add(info);
         }
+
         return result;
     }
 
diff --git a/test/hotspot/jtreg/vmTestbase/vm/mlvm/meth/func/jdi/breakpoint/Test.java b/test/hotspot/jtreg/vmTestbase/vm/mlvm/meth/func/jdi/breakpoint/Test.java
index fba74bf1b20..61142c7303d 100644
--- a/test/hotspot/jtreg/vmTestbase/vm/mlvm/meth/func/jdi/breakpoint/Test.java
+++ b/test/hotspot/jtreg/vmTestbase/vm/mlvm/meth/func/jdi/breakpoint/Test.java
@@ -21,7 +21,6 @@
  * questions.
  */
 
-
 /*
  * @test
  * @key randomness
@@ -43,7 +42,7 @@
  * @build vm.mlvm.meth.func.jdi.breakpoint.Test
  * @run driver vm.mlvm.share.IndifiedClassesBuilder
  *
- * @run main/othervm PropertyResolvingWrapper
+ * @run main/othervm
  *      vm.mlvm.meth.func.jdi.breakpoint.Test
  *      -verbose
  *      -arch=${os.family}-${os.simpleArch}
@@ -58,7 +57,6 @@ package vm.mlvm.meth.func.jdi.breakpoint;
 import vm.mlvm.share.jdi.ArgumentHandler;
 import vm.mlvm.share.jdi.BreakpointInfo;
 import vm.mlvm.share.jdi.JDIBreakpointTest;
-import vm.mlvm.share.jpda.StratumInfo;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -85,7 +83,6 @@ public class Test extends JDIBreakpointTest {
         return result;
     }
 
-
     public static void main(String[] args) {
         launch(new ArgumentHandler(args));
     }
diff --git a/test/hotspot/jtreg/vmTestbase/vm/mlvm/meth/func/jdi/breakpointOtherStratum/Test.java b/test/hotspot/jtreg/vmTestbase/vm/mlvm/meth/func/jdi/breakpointOtherStratum/Test.java
index 835b24abb01..4f9d8c578fc 100644
--- a/test/hotspot/jtreg/vmTestbase/vm/mlvm/meth/func/jdi/breakpointOtherStratum/Test.java
+++ b/test/hotspot/jtreg/vmTestbase/vm/mlvm/meth/func/jdi/breakpointOtherStratum/Test.java
@@ -21,7 +21,6 @@
  * questions.
  */
 
-
 /*
  * @test
  *
@@ -49,7 +48,7 @@
  *      vm.mlvm.share.StratumClassesBuilder
  *      vmTestbase/vm/mlvm/share/jpda/SDE_MHDebuggeeBase.java
  *
- * @run main/othervm PropertyResolvingWrapper
+ * @run main/othervm
  *      vm.mlvm.meth.func.jdi.breakpointOtherStratum.Test
  *      -verbose
  *      -arch=${os.family}-${os.simpleArch}
@@ -70,7 +69,7 @@ import vm.mlvm.share.jpda.StratumInfo;
 import java.util.ArrayList;
 import java.util.List;
 
-public class Test  extends JDIBreakpointTest {
+public class Test extends JDIBreakpointTest {
     @Override
     protected List<BreakpointInfo> getBreakpoints(String debuggeeClassName) {
         List<BreakpointInfo> result = new ArrayList<>();
@@ -106,10 +105,10 @@ public class Test  extends JDIBreakpointTest {
             info.stratumInfo = new StratumInfo("Logo", "SDE_MHDebuggeeBase.logo", 6);
             result.add(info);
         }
+
         return result;
     }
 
-
     public static void main(String[] args) {
         launch(new ArgumentHandler(args));
     }
diff --git a/test/hotspot/jtreg/vmTestbase/vm/mlvm/meth/stress/jdi/breakpointInCompiledCode/Test.java b/test/hotspot/jtreg/vmTestbase/vm/mlvm/meth/stress/jdi/breakpointInCompiledCode/Test.java
index 7bcec3d8369..78cdb534c11 100644
--- a/test/hotspot/jtreg/vmTestbase/vm/mlvm/meth/stress/jdi/breakpointInCompiledCode/Test.java
+++ b/test/hotspot/jtreg/vmTestbase/vm/mlvm/meth/stress/jdi/breakpointInCompiledCode/Test.java
@@ -43,7 +43,7 @@
  * @build vm.mlvm.meth.stress.jdi.breakpointInCompiledCode.Test
  * @run driver vm.mlvm.share.IndifiedClassesBuilder
  *
- * @run main/othervm PropertyResolvingWrapper
+ * @run main/othervm
  *      vm.mlvm.meth.stress.jdi.breakpointInCompiledCode.Test
  *      -verbose
  *      -arch=${os.family}-${os.simpleArch}