diff --git a/test/files/instrumented/inline-in-constructors/assert_1.scala b/test/files/instrumented/inline-in-constructors/assert_1.scala
index 9918f39e14b5..9c055a49475e 100644
--- a/test/files/instrumented/inline-in-constructors/assert_1.scala
+++ b/test/files/instrumented/inline-in-constructors/assert_1.scala
@@ -1,4 +1,4 @@
-// scalac: -opt:l:inline -opt-inline-from:**
+// scalac: -opt:inline:** -Wopt
 package instrumented
 
 object MyPredef {
diff --git a/test/files/instrumented/inline-in-constructors/bar_2.scala b/test/files/instrumented/inline-in-constructors/bar_2.scala
index 6c23832f87fb..7a4c4504b898 100644
--- a/test/files/instrumented/inline-in-constructors/bar_2.scala
+++ b/test/files/instrumented/inline-in-constructors/bar_2.scala
@@ -1,4 +1,4 @@
-// scalac: -opt:l:inline -opt-inline-from:**
+// scalac: -opt:inline:**
 package instrumented
 
 /** Class that uses assert compiled in previous compiler run so we check if
diff --git a/test/files/instrumented/inline-in-constructors/test_3.scala b/test/files/instrumented/inline-in-constructors/test_3.scala
index 7dccf6db99e0..00fbf8bd5d44 100644
--- a/test/files/instrumented/inline-in-constructors/test_3.scala
+++ b/test/files/instrumented/inline-in-constructors/test_3.scala
@@ -1,4 +1,4 @@
-// scalac: -opt:l:inline -opt-inline-from:**
+// scalac: -opt:inline:** -Wopt
 import scala.tools.partest.instrumented.Instrumentation._
 import instrumented._
 
diff --git a/test/files/neg/inlineIndyLambdaPrivate/Test_2.scala b/test/files/neg/inlineIndyLambdaPrivate/Test_2.scala
index 14ec4567bca4..0c02726f704c 100644
--- a/test/files/neg/inlineIndyLambdaPrivate/Test_2.scala
+++ b/test/files/neg/inlineIndyLambdaPrivate/Test_2.scala
@@ -1,4 +1,4 @@
-// scalac: -opt:l:inline -opt-inline-from:** -Yopt-inline-heuristics:everything -opt-warnings:_ -Werror
+// scalac: -opt:inline:** -Yopt-inline-heuristics:everything -Wopt -Werror
 class Test {
   def foo = A_1.test
 }
diff --git a/test/files/neg/sealed-final-neg.scala b/test/files/neg/sealed-final-neg.scala
index 5406830b7ec5..25ad1ed8b55c 100644
--- a/test/files/neg/sealed-final-neg.scala
+++ b/test/files/neg/sealed-final-neg.scala
@@ -1,4 +1,4 @@
-// scalac: -Xfatal-warnings -opt:l:inline -opt-inline-from:** -opt-warnings
+// scalac: -Werror -opt:inline:** -Wopt
 //
 package neg1 {
   sealed abstract class Foo {
diff --git a/test/files/neg/t11746.scala b/test/files/neg/t11746.scala
index e864a6458b43..9cdde1ac4233 100644
--- a/test/files/neg/t11746.scala
+++ b/test/files/neg/t11746.scala
@@ -1,5 +1,5 @@
 //
-// scalac: -Werror -opt:l:inline -opt-inline-from:'**' -opt-warnings:none,_
+// scalac: -Werror -opt:inline:** -Wopt:none
 //
 // compare -opt-warnings:none,at-inline-failed-summary
 
diff --git a/test/files/pos/inline-access-levels/A_1.scala b/test/files/pos/inline-access-levels/A_1.scala
index 1bb7d2d61ad3..ff2620161c65 100644
--- a/test/files/pos/inline-access-levels/A_1.scala
+++ b/test/files/pos/inline-access-levels/A_1.scala
@@ -1,4 +1,4 @@
-// scalac: -opt:l:inline -opt-inline-from:** -opt-warnings -Werror
+// scalac: -opt:inline:** -Wopt -Werror
 package test
 
 object A {
diff --git a/test/files/pos/inline-access-levels/Test_2.scala b/test/files/pos/inline-access-levels/Test_2.scala
index f732848ad146..a9aedd61e0b8 100644
--- a/test/files/pos/inline-access-levels/Test_2.scala
+++ b/test/files/pos/inline-access-levels/Test_2.scala
@@ -1,4 +1,4 @@
-// scalac: -opt:l:inline -opt-inline-from:** -opt-warnings -Werror
+// scalac: -opt:inline:** -Wopt -Werror
 package test
 
 object Test {
diff --git a/test/files/pos/t11663/B_2.scala b/test/files/pos/t11663/B_2.scala
index 6c4245405966..eabc949fda7d 100644
--- a/test/files/pos/t11663/B_2.scala
+++ b/test/files/pos/t11663/B_2.scala
@@ -1,4 +1,4 @@
-// scalac: -opt:l:inline -opt-inline-from:** -opt-warnings:_
+// scalac: -opt:inline:** -Wopt
 class B {
    def bar(c: A) = c.m
 }
diff --git a/test/files/pos/t3234.scala b/test/files/pos/t3234.scala
index 735ded63cf2b..bd2746ca941e 100644
--- a/test/files/pos/t3234.scala
+++ b/test/files/pos/t3234.scala
@@ -1,5 +1,5 @@
 
-// scalac: -opt:l:inline -opt-inline-from:** -opt-warnings -Xfatal-warnings
+// scalac: -opt:inline:** -Wopt -Werror
 //
 trait Trait1 {
   @inline final def foo2(n: Int) = n*n
diff --git a/test/files/pos/t3420.scala b/test/files/pos/t3420.scala
index 0ec178785f49..0d0bc9a0ab77 100644
--- a/test/files/pos/t3420.scala
+++ b/test/files/pos/t3420.scala
@@ -1,5 +1,5 @@
 
-// scalac: -opt-warnings -opt:l:inline -opt-inline-from:** -Xfatal-warnings
+// scalac: -opt:inline:** -Wopt -Werror
 //
 class C {
     val cv = Map[Int, Int](1 -> 2)
diff --git a/test/files/pos/t4840.scala b/test/files/pos/t4840.scala
index 99fcb37cef33..b31d37b1ab30 100644
--- a/test/files/pos/t4840.scala
+++ b/test/files/pos/t4840.scala
@@ -1,5 +1,5 @@
 
-// scalac: -opt:l:inline -opt-inline-from:**
+// scalac: -opt:inline:** -Wopt
 //
 class Crashy {
   def g(): Option[Any] = None
diff --git a/test/files/pos/t8410.scala b/test/files/pos/t8410.scala
index d57a0a3756d0..6b420efd8946 100644
--- a/test/files/pos/t8410.scala
+++ b/test/files/pos/t8410.scala
@@ -1,4 +1,4 @@
-// scalac: -opt:l:inline -opt-inline-from:** -Xfatal-warnings -deprecation:false -opt-warnings:none
+// scalac: -opt:inline:** -Wopt:none -Werror -deprecation:false
 //
 
 object Test extends App {
diff --git a/test/files/pos/t9111-inliner-workaround/Test_1.scala b/test/files/pos/t9111-inliner-workaround/Test_1.scala
index 22d6a820d8f0..dd9a7074be57 100644
--- a/test/files/pos/t9111-inliner-workaround/Test_1.scala
+++ b/test/files/pos/t9111-inliner-workaround/Test_1.scala
@@ -1,4 +1,4 @@
-// scalac: -opt:l:inline -opt-inline-from:**
+// scalac: -opt:inline:** -Wopt
 //
 object Test extends App {
   println(new A_1.Inner())
diff --git a/test/files/run/bcodeInlinerMixed/B_1.scala b/test/files/run/bcodeInlinerMixed/B_1.scala
index c512fd43d5d2..bb6cf8220962 100644
--- a/test/files/run/bcodeInlinerMixed/B_1.scala
+++ b/test/files/run/bcodeInlinerMixed/B_1.scala
@@ -1,4 +1,4 @@
-// scalac: -opt:l:inline -opt-inline-from:**
+// scalac: -opt:inline:**
 //
 // Since 1.0.18, partest does mixed compilation only in two stages 
 //   1. scalac *.scala *.java
diff --git a/test/files/run/bcodeInlinerMixed/Test_2.scala b/test/files/run/bcodeInlinerMixed/Test_2.scala
index 6825888193c1..fe0ee721a7b1 100644
--- a/test/files/run/bcodeInlinerMixed/Test_2.scala
+++ b/test/files/run/bcodeInlinerMixed/Test_2.scala
@@ -1,4 +1,4 @@
-// scalac: -opt:l:inline -opt-inline-from:**
+// scalac: -opt:inline:**
 //
 import scala.tools.partest.BytecodeTest
 import scala.tools.testkit.ASMConverters
diff --git a/test/files/run/classfile-format-51.scala b/test/files/run/classfile-format-51.scala
index 13456b4f75a6..167f4698e66b 100644
--- a/test/files/run/classfile-format-51.scala
+++ b/test/files/run/classfile-format-51.scala
@@ -17,7 +17,7 @@ import Opcodes._
 // verify. So the test includes a version check that short-circuits the whole test
 // on JDK 6
 object Test extends DirectTest {
-  override def extraSettings: String = s"-opt:l:inline -opt-inline-from:** -usejavacp -cp ${testOutput.path}"
+  override def extraSettings: String = s"-opt:inline:** -usejavacp -cp ${testOutput.path}"
 
   def generateClass(): Unit = {
     val invokerClassName =  "DynamicInvoker"
diff --git a/test/files/run/classfile-format-52.scala b/test/files/run/classfile-format-52.scala
index 5ab2526de06d..efd9ee88d767 100644
--- a/test/files/run/classfile-format-52.scala
+++ b/test/files/run/classfile-format-52.scala
@@ -14,7 +14,7 @@ import Opcodes._
 // By its nature the test can only work on JDK 8+ because under JDK 7- the
 // interface won't verify.
 object Test extends DirectTest {
-  override def extraSettings: String = s"-opt:l:inline -opt-inline-from:** -usejavacp -cp ${testOutput.path}"
+  override def extraSettings: String = s"-opt:inline:** -usejavacp -cp ${testOutput.path}"
 
   def generateInterface(): Unit = {
     val interfaceName =  "HasDefaultMethod"
diff --git a/test/files/run/icode-reader-dead-code.scala b/test/files/run/icode-reader-dead-code.scala
index dd3934a0eef6..09128f499e43 100644
--- a/test/files/run/icode-reader-dead-code.scala
+++ b/test/files/run/icode-reader-dead-code.scala
@@ -36,7 +36,7 @@ object Test extends DirectTest {
 
     // If inlining fails, the compiler will issue an inliner warning that is not present in the
     // check file
-    compileString(newCompiler("-cp", testOutput.path, "-opt:l:inline", "-opt-inline-from:**"))(bCode)
+    compileString(newCompiler("-cp", testOutput.path, "-opt:inline:**"))(bCode)
   }
 
   def readClass(file: String) = {
diff --git a/test/files/run/indyLambdaKinds/Test_2.scala b/test/files/run/indyLambdaKinds/Test_2.scala
index a20465d458be..b6e216619b66 100644
--- a/test/files/run/indyLambdaKinds/Test_2.scala
+++ b/test/files/run/indyLambdaKinds/Test_2.scala
@@ -3,7 +3,7 @@ import reflect.internal.util._
 
 object Test extends DirectTest {
 
-  override def extraSettings: String = s"-usejavacp -cp ${testOutput.path} -opt:l:inline -opt-inline-from:** -Yopt-log-inline _"
+  override def extraSettings: String = s"-usejavacp -cp ${testOutput.path} -opt:inline:** -Yopt-log-inline _"
 
   override def code = """object Main {
   @noinline def t1a(a: A_1) = a.a(): @inline
diff --git a/test/files/run/inline-stack-map-frames/A_1.scala b/test/files/run/inline-stack-map-frames/A_1.scala
index f39ee585a654..942b8591271b 100644
--- a/test/files/run/inline-stack-map-frames/A_1.scala
+++ b/test/files/run/inline-stack-map-frames/A_1.scala
@@ -1,4 +1,4 @@
-// scalac: -opt:l:inline -opt-inline-from:**
+// scalac: -opt:inline:**
 class A {
   @noinline final def b: B = null
   @inline final def a: A = b
diff --git a/test/files/run/inline-stack-map-frames/Test_2.scala b/test/files/run/inline-stack-map-frames/Test_2.scala
index 6cacde92701a..3a904a6e940d 100644
--- a/test/files/run/inline-stack-map-frames/Test_2.scala
+++ b/test/files/run/inline-stack-map-frames/Test_2.scala
@@ -1,4 +1,4 @@
-// scalac: -opt:l:inline -opt-inline-from:**
+// scalac: -opt:inline:**
 class C {
   def t(a: A): AnyRef = {
     // a.a is inlined, resulting in a.b, which has return type B
diff --git a/test/files/run/noInlineUnknownIndy/Test.scala b/test/files/run/noInlineUnknownIndy/Test.scala
index 547194e169a1..95646f33b46f 100644
--- a/test/files/run/noInlineUnknownIndy/Test.scala
+++ b/test/files/run/noInlineUnknownIndy/Test.scala
@@ -11,7 +11,7 @@ object Test extends DirectTest {
 
   override def extraSettings = {
     val classpath = List(sys.props("partest.lib"), testOutput.path).mkString(sys.props("path.separator"))
-    s"-cp $classpath -opt:l:inline -opt-inline-from:** -Yopt-inline-heuristics:everything -opt-warnings:_"
+    s"-cp $classpath -opt:inline:** -Yopt-inline-heuristics:everything -Wopt"
   }
 
   override def show(): Unit = {
diff --git a/test/files/run/repl-inline.scala b/test/files/run/repl-inline.scala
index 4b05aece106d..6f499a81734e 100644
--- a/test/files/run/repl-inline.scala
+++ b/test/files/run/repl-inline.scala
@@ -16,7 +16,7 @@ assert(h == "h", h)
   def main(args: Array[String]): Unit = {
     def test(f: Settings => Unit): Unit = {
       val settings = new Settings()
-      settings.processArgumentString("-opt:l:inline -opt-inline-from:** -opt-warnings")
+      settings.processArgumentString("-opt:inline:** -Wopt")
       f(settings)
       settings.usejavacp.value = true
       val repl = new interpreter.IMain(settings, new ReplReporterImpl(settings))
diff --git a/test/files/run/synchronized.scala b/test/files/run/synchronized.scala
index 06966adf8599..df11309416e6 100644
--- a/test/files/run/synchronized.scala
+++ b/test/files/run/synchronized.scala
@@ -1,4 +1,4 @@
-// scalac: -opt:l:inline -opt-inline-from:**
+// scalac: -opt:inline:**
 //
 /*
  * filter: optimizer warnings;
diff --git a/test/files/run/t11255/A_1.scala b/test/files/run/t11255/A_1.scala
index 3e33c3971aa8..ad879d0c16f8 100644
--- a/test/files/run/t11255/A_1.scala
+++ b/test/files/run/t11255/A_1.scala
@@ -1,4 +1,4 @@
-// scalac: -opt:l:inline -opt-inline-from:**
+// scalac: -opt:inline:**
 class K(val f: Int => Int) extends Serializable
 class A {
   @inline final def f = new K(x => x + 1)
diff --git a/test/files/run/t11255/Test_2.scala b/test/files/run/t11255/Test_2.scala
index ec5dcaa60361..3a257086c6a4 100644
--- a/test/files/run/t11255/Test_2.scala
+++ b/test/files/run/t11255/Test_2.scala
@@ -1,4 +1,4 @@
-// scalac: -opt:l:inline -opt-inline-from:**
+// scalac: -opt:inline:**
 object Test {
   def serializeDeserialize(obj: Object): Object = {
     import java.io._
diff --git a/test/files/run/t2106.scala b/test/files/run/t2106.scala
index bbb0930c60bd..4699ef662796 100644
--- a/test/files/run/t2106.scala
+++ b/test/files/run/t2106.scala
@@ -1,4 +1,4 @@
-// scalac: -opt-warnings -opt:l:inline -opt-inline-from:**
+// scalac: -opt:inline:** -Wopt
 //
 class A extends Cloneable {
   @inline final def foo = clone()
diff --git a/test/files/run/t3509.scala b/test/files/run/t3509.scala
index c9f9c31a4c13..1d89a838c580 100644
--- a/test/files/run/t3509.scala
+++ b/test/files/run/t3509.scala
@@ -1,4 +1,4 @@
-// scalac: -opt:l:inline -opt-inline-from:**
+// scalac: -opt:inline:**
 //
 object Test {
 
diff --git a/test/files/run/t3569.scala b/test/files/run/t3569.scala
index 48b1e53b52f6..b393e9dcf6a1 100644
--- a/test/files/run/t3569.scala
+++ b/test/files/run/t3569.scala
@@ -1,4 +1,4 @@
-// scalac: -opt:l:inline -opt-inline-from:**
+// scalac: -opt:inline:**
 //
 object Test {
   final val bippy1 = 1
diff --git a/test/files/run/t4285.scala b/test/files/run/t4285.scala
index 7592e0059600..3a369235510d 100644
--- a/test/files/run/t4285.scala
+++ b/test/files/run/t4285.scala
@@ -1,4 +1,4 @@
-// scalac: -opt:l:inline -opt-inline-from:**
+// scalac: -opt:inline:**
 //
 import scala.tools.partest.ReplTest
 object Test extends ReplTest {
diff --git a/test/files/run/t4935.scala b/test/files/run/t4935.scala
index 7920a34d43ea..0b3a9a72ad55 100644
--- a/test/files/run/t4935.scala
+++ b/test/files/run/t4935.scala
@@ -1,4 +1,4 @@
-// scalac: -opt:l:inline -opt-inline-from:**
+// scalac: -opt:inline:**
 //
 object Test extends App {
   for (i <- 0 to 1) {
diff --git a/test/files/run/t5789.scala b/test/files/run/t5789.scala
index df234c274134..108d8ebd9a89 100644
--- a/test/files/run/t5789.scala
+++ b/test/files/run/t5789.scala
@@ -4,7 +4,7 @@ import scala.tools.partest.{Lambdaless, ReplTest}
 
 
 object Test extends ReplTest with Lambdaless {
-  override def extraSettings = "-opt:l:inline -opt-inline-from:**"
+  override def extraSettings = "-opt:inline:**"
   def code = """
     val n = 2
     () => n
diff --git a/test/files/run/t6102.scala b/test/files/run/t6102.scala
index ad75971d3f80..edcdf439b857 100644
--- a/test/files/run/t6102.scala
+++ b/test/files/run/t6102.scala
@@ -1,4 +1,4 @@
-// scalac: -opt:l:inline -opt-inline-from:** -Werror
+// scalac: -opt:inline:** -Werror
 //
 // scala/bug#6102 Wrong bytecode in lazyval + no-op finally clause
 
diff --git a/test/files/run/t6188.scala b/test/files/run/t6188.scala
index b90bac057a27..26dde6ea1d53 100644
--- a/test/files/run/t6188.scala
+++ b/test/files/run/t6188.scala
@@ -1,4 +1,4 @@
-// scalac: -opt:l:inline -opt-inline-from:**
+// scalac: -opt:inline:**
 //
 // scala/bug#6188 Optimizer incorrectly removes method invocations containing throw expressions
 
diff --git a/test/files/run/t7459b-optimize.scala b/test/files/run/t7459b-optimize.scala
index 079119d6d15d..ececda96b499 100644
--- a/test/files/run/t7459b-optimize.scala
+++ b/test/files/run/t7459b-optimize.scala
@@ -1,4 +1,4 @@
-// scalac: -opt:l:inline -opt-inline-from:**
+// scalac: -opt:inline:**
 //
 class LM {
   class Node[B1]
diff --git a/test/files/run/t7582/InlineHolder_2.scala b/test/files/run/t7582/InlineHolder_2.scala
index 42d365d2eec0..4651dc0f9e5f 100644
--- a/test/files/run/t7582/InlineHolder_2.scala
+++ b/test/files/run/t7582/InlineHolder_2.scala
@@ -1,4 +1,4 @@
-// scalac: -opt:l:inline -opt-inline-from:** -opt-warnings
+// scalac: -opt:inline:** -Wopt -Werror
 package p1 {
   object InlineHolder {
     @inline def inlinable = (p1.PackageProtectedJava_1.protectedMethod(): @noinline) + 1
diff --git a/test/files/run/t7582b/InlineHolder_2.scala b/test/files/run/t7582b/InlineHolder_2.scala
index 42d365d2eec0..82eb737299e1 100644
--- a/test/files/run/t7582b/InlineHolder_2.scala
+++ b/test/files/run/t7582b/InlineHolder_2.scala
@@ -1,4 +1,4 @@
-// scalac: -opt:l:inline -opt-inline-from:** -opt-warnings
+// scalac: -opt:inline:** -Wopt
 package p1 {
   object InlineHolder {
     @inline def inlinable = (p1.PackageProtectedJava_1.protectedMethod(): @noinline) + 1
diff --git a/test/files/run/t8601-closure-elim.scala b/test/files/run/t8601-closure-elim.scala
index 406d822be76c..d65a0876b11b 100644
--- a/test/files/run/t8601-closure-elim.scala
+++ b/test/files/run/t8601-closure-elim.scala
@@ -1,4 +1,4 @@
-// scalac: -Ydelambdafy:method -opt:l:inline -opt-inline-from:**
+// scalac: -Ydelambdafy:method -opt:inline:**
 //
 import scala.tools.partest.BytecodeTest
 import scala.tools.testkit.ASMConverters.instructionsFromMethod
diff --git a/test/files/run/t8601.scala b/test/files/run/t8601.scala
index 4e8cb0510c34..9858f6220094 100644
--- a/test/files/run/t8601.scala
+++ b/test/files/run/t8601.scala
@@ -1,4 +1,4 @@
-// scalac: -opt:l:inline -opt-inline-from:**
+// scalac: -opt:inline:**
 //
 object Test {
   def idiv(x: Int): Unit = x / 0
diff --git a/test/files/run/t8601b.scala b/test/files/run/t8601b.scala
index 0cb2bbc6b6aa..d8daece4e25f 100644
--- a/test/files/run/t8601b.scala
+++ b/test/files/run/t8601b.scala
@@ -1,4 +1,4 @@
-// scalac: -opt:l:inline -opt-inline-from:**
+// scalac: -opt:inline:**
 //
 object Test {
   def len(x: Array[String]): Unit = x.length
diff --git a/test/files/run/t8601c.scala b/test/files/run/t8601c.scala
index 8a414df0733e..403e506ddf98 100644
--- a/test/files/run/t8601c.scala
+++ b/test/files/run/t8601c.scala
@@ -1,4 +1,4 @@
-// scalac: -opt:l:inline -opt-inline-from:**
+// scalac: -opt:inline:**
 //
 object Test {
   def loadField(x: scala.runtime.IntRef): Unit = x.elem
diff --git a/test/files/run/t8601d.scala b/test/files/run/t8601d.scala
index 047e2f63280f..c567abcd434a 100644
--- a/test/files/run/t8601d.scala
+++ b/test/files/run/t8601d.scala
@@ -1,4 +1,4 @@
-// scalac: -opt:l:inline -opt-inline-from:**
+// scalac: -opt:inline:**
 //
 object Test {
   def monitor(x: AnyRef): Unit = {x.synchronized(()); ()}
diff --git a/test/files/run/t8601e/Test.scala b/test/files/run/t8601e/Test.scala
index ed8e49c37fd0..44a8eb18b756 100644
--- a/test/files/run/t8601e/Test.scala
+++ b/test/files/run/t8601e/Test.scala
@@ -1,4 +1,4 @@
-// scalac: -opt:l:inline -opt-inline-from:**
+// scalac: -opt:inline:**
 class C {
   def foo: Unit = {StaticInit.fld}
 }
diff --git a/test/files/run/t9003.scala b/test/files/run/t9003.scala
index a6529db06b00..b5dc21027476 100644
--- a/test/files/run/t9003.scala
+++ b/test/files/run/t9003.scala
@@ -1,4 +1,4 @@
-// scalac: -opt:l:inline -opt-inline-from:**
+// scalac: -opt:inline:**
 //
 object Single {
   var i = 0
diff --git a/test/files/run/t9403/C_1.scala b/test/files/run/t9403/C_1.scala
index 391e4b51f02e..e3b5c6d75b28 100644
--- a/test/files/run/t9403/C_1.scala
+++ b/test/files/run/t9403/C_1.scala
@@ -1,4 +1,4 @@
-// scalac: -opt:l:inline -opt-inline-from:**
+// scalac: -opt:inline:**
 package p
 class C {
   @inline final def f(x: Int): Long = 10L / (if (x < 0) -2 else 2)
diff --git a/test/files/run/t9403/Test_2.scala b/test/files/run/t9403/Test_2.scala
index c0903114cf7f..be56f42073b8 100644
--- a/test/files/run/t9403/Test_2.scala
+++ b/test/files/run/t9403/Test_2.scala
@@ -1,4 +1,4 @@
-// scalac: -opt:l:inline -opt-inline-from:**
+// scalac: -opt:inline:**
 import p.C
 import scala.tools.asm.Opcodes
 import scala.tools.partest.BytecodeTest
diff --git a/test/junit/scala/tools/nsc/backend/jvm/InnerClassAttributeTest.scala b/test/junit/scala/tools/nsc/backend/jvm/InnerClassAttributeTest.scala
index af6042b7f429..9e76a9425414 100644
--- a/test/junit/scala/tools/nsc/backend/jvm/InnerClassAttributeTest.scala
+++ b/test/junit/scala/tools/nsc/backend/jvm/InnerClassAttributeTest.scala
@@ -14,7 +14,7 @@ import scala.tools.testkit.BytecodeTesting._
 class InnerClassAttributeTest extends BytecodeTesting {
   import compiler._
 
-  val optCompiler = cached("optCompiler", () => newCompiler(extraArgs = "-opt:l:inline -opt-inline-from:**"))
+  val optCompiler = cached("optCompiler", () => newCompiler(extraArgs = "-opt:inline:**"))
 
   @Test
   def javaInnerClassInGenericSignatureOnly(): Unit = {
diff --git a/test/junit/scala/tools/nsc/backend/jvm/OptimizedBytecodeTest.scala b/test/junit/scala/tools/nsc/backend/jvm/OptimizedBytecodeTest.scala
index 02e8cf53eb19..bc94e86f8743 100644
--- a/test/junit/scala/tools/nsc/backend/jvm/OptimizedBytecodeTest.scala
+++ b/test/junit/scala/tools/nsc/backend/jvm/OptimizedBytecodeTest.scala
@@ -11,7 +11,7 @@ import scala.tools.testkit.BytecodeTesting._
 
 @RunWith(classOf[JUnit4])
 class OptimizedBytecodeTest extends BytecodeTesting {
-  override def compilerArgs = "-opt:l:inline -opt-inline-from:** -opt-warnings"
+  override def compilerArgs = "-opt:inline:** -Wopt"
   import compiler._
 
   @Test
diff --git a/test/junit/scala/tools/nsc/backend/jvm/opt/BoxUnboxAndInlineTest.scala b/test/junit/scala/tools/nsc/backend/jvm/opt/BoxUnboxAndInlineTest.scala
index 7277f3a91797..fc6752101ae2 100644
--- a/test/junit/scala/tools/nsc/backend/jvm/opt/BoxUnboxAndInlineTest.scala
+++ b/test/junit/scala/tools/nsc/backend/jvm/opt/BoxUnboxAndInlineTest.scala
@@ -17,7 +17,7 @@ import scala.tools.testkit.BytecodeTesting._
   */
 @RunWith(classOf[JUnit4])
 class BoxUnboxAndInlineTest extends BytecodeTesting {
-  override def compilerArgs = "-opt:l:inline -opt-inline-from:**/*"
+  override def compilerArgs = "-opt:inline:**/*"
   import compiler._
 
   // Was crashing in 2.13.x once https://github.com/scala/scala/pull/9433 was merged in.
diff --git a/test/junit/scala/tools/nsc/backend/jvm/opt/ClosureOptimizerTest.scala b/test/junit/scala/tools/nsc/backend/jvm/opt/ClosureOptimizerTest.scala
index ea1a20faed23..66ca8c3ed9dd 100644
--- a/test/junit/scala/tools/nsc/backend/jvm/opt/ClosureOptimizerTest.scala
+++ b/test/junit/scala/tools/nsc/backend/jvm/opt/ClosureOptimizerTest.scala
@@ -13,7 +13,7 @@ import scala.tools.testkit.BytecodeTesting._
 
 @RunWith(classOf[JUnit4])
 class ClosureOptimizerTest extends BytecodeTesting {
-  override def compilerArgs = "-opt:l:inline -opt-inline-from:** -opt-warnings:_"
+  override def compilerArgs = "-opt:inline:** -Wopt"
   import compiler._
 
   @Test
diff --git a/test/junit/scala/tools/nsc/backend/jvm/opt/InlineInfoTest.scala b/test/junit/scala/tools/nsc/backend/jvm/opt/InlineInfoTest.scala
index a1df7f091d3a..003d47ca0354 100644
--- a/test/junit/scala/tools/nsc/backend/jvm/opt/InlineInfoTest.scala
+++ b/test/junit/scala/tools/nsc/backend/jvm/opt/InlineInfoTest.scala
@@ -18,7 +18,7 @@ class InlineInfoTest extends BytecodeTesting {
   import compiler._
   import global.genBCode.{bTypes, postProcessor}
 
-  override def compilerArgs = "-opt:l:inline -opt-inline-from:**"
+  override def compilerArgs = "-opt:inline:**"
 
   compiler.keepPerRunCachesAfterRun(List(
     JavaClearable.forMap(bTypes.classBTypeCache),
diff --git a/test/junit/scala/tools/nsc/backend/jvm/opt/InlineSourceMatcherTest.scala b/test/junit/scala/tools/nsc/backend/jvm/opt/InlineSourceMatcherTest.scala
index d8bf3c5dee14..60a171fe4ebf 100644
--- a/test/junit/scala/tools/nsc/backend/jvm/opt/InlineSourceMatcherTest.scala
+++ b/test/junit/scala/tools/nsc/backend/jvm/opt/InlineSourceMatcherTest.scala
@@ -15,7 +15,7 @@ import scala.tools.testkit.BytecodeTesting._
 class InlineSourceMatcherTest extends BytecodeTesting {
   import compiler._
 
-  override def compilerArgs = "-opt:l:inline -opt-warnings"
+  override def compilerArgs = "-opt:inline -Wopt"
   def setInlineFrom(s: String): Unit = {
     //global.settings.optInlineFrom.value = s.split(':').toList
     global.settings.optChoices.inline.selections = s.split(':').toList
diff --git a/test/junit/scala/tools/nsc/backend/jvm/opt/InlineWarningTest.scala b/test/junit/scala/tools/nsc/backend/jvm/opt/InlineWarningTest.scala
index f88ddc8f6041..bd46ba5a4714 100644
--- a/test/junit/scala/tools/nsc/backend/jvm/opt/InlineWarningTest.scala
+++ b/test/junit/scala/tools/nsc/backend/jvm/opt/InlineWarningTest.scala
@@ -11,8 +11,7 @@ import scala.tools.testkit.BytecodeTesting._
 
 @RunWith(classOf[JUnit4])
 class InlineWarningTest extends BytecodeTesting {
-  def optInline = "-opt:l:inline -opt-inline-from:**"
-  override def compilerArgs = s"$optInline -opt-warnings"
+  override def compilerArgs = "-opt:inline:** -Wopt"
 
   import compiler._
 
diff --git a/test/junit/scala/tools/nsc/backend/jvm/opt/InlinerSeparateCompilationTest.scala b/test/junit/scala/tools/nsc/backend/jvm/opt/InlinerSeparateCompilationTest.scala
index 4754e7127b8b..02e00a5e2a63 100644
--- a/test/junit/scala/tools/nsc/backend/jvm/opt/InlinerSeparateCompilationTest.scala
+++ b/test/junit/scala/tools/nsc/backend/jvm/opt/InlinerSeparateCompilationTest.scala
@@ -10,7 +10,7 @@ import scala.tools.testkit.BytecodeTesting._
 
 @RunWith(classOf[JUnit4])
 class InlinerSeparateCompilationTest {
-  val args = "-opt:l:inline -opt-inline-from:**"
+  val args = "-opt:inline:**"
 
   @Test
   def inlineMixedinMember(): Unit = {
diff --git a/test/junit/scala/tools/nsc/backend/jvm/opt/InlinerTest.scala b/test/junit/scala/tools/nsc/backend/jvm/opt/InlinerTest.scala
index 388660a1bdd7..4285caa9aea6 100644
--- a/test/junit/scala/tools/nsc/backend/jvm/opt/InlinerTest.scala
+++ b/test/junit/scala/tools/nsc/backend/jvm/opt/InlinerTest.scala
@@ -18,7 +18,7 @@ import scala.tools.testkit.BytecodeTesting._
 
 @RunWith(classOf[JUnit4])
 class InlinerTest extends BytecodeTesting {
-  override def compilerArgs = "-opt:l:inline -opt-inline-from:** -opt-warnings"
+  override def compilerArgs = "-opt:inline:** -Wopt"
 
   val inlineOnlyCompiler = cached("inlineOnlyCompiler", () => newCompiler(extraArgs = "-opt:inline -opt-inline-from:**"))
 
diff --git a/test/junit/scala/tools/nsc/transform/patmat/PatmatBytecodeTest.scala b/test/junit/scala/tools/nsc/transform/patmat/PatmatBytecodeTest.scala
index 46ed47a6e3a5..8048348cf4be 100644
--- a/test/junit/scala/tools/nsc/transform/patmat/PatmatBytecodeTest.scala
+++ b/test/junit/scala/tools/nsc/transform/patmat/PatmatBytecodeTest.scala
@@ -15,7 +15,7 @@ import PartialFunction.cond
 
 @RunWith(classOf[JUnit4])
 class PatmatBytecodeTest extends BytecodeTesting {
-  val optCompiler = cached("optCompiler", () => newCompiler(extraArgs = "-opt:l:inline -opt-inline-from:**"))
+  val optCompiler = cached("optCompiler", () => newCompiler(extraArgs = "-opt:inline:**"))
 
   import compiler._