diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/aar-packaging/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/aar-packaging/project/plugins.sbt
index 152225a9e..71a44ffd3 100644
--- a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/aar-packaging/project/plugins.sbt
+++ b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/aar-packaging/project/plugins.sbt
@@ -1,11 +1,13 @@
-{
-  val pluginVersion = sys.props.getOrElse(
+addSbtPlugin {
+
+  val name = sys.props.getOrElse(
+    "plugin.name",
+    sys.error("plugin.name Java property not set")
+  )
+  val version = sys.props.getOrElse(
     "plugin.version",
-    throw new RuntimeException(
-      """|The system property 'plugin.version' is not defined.
-         |Specify this property using the scriptedLaunchOpts -D.""".stripMargin
-    )
+    sys.error("plugin.version Java property not set")
   )
 
-  addSbtPlugin("io.get-coursier" % "sbt-coursier" % pluginVersion)
-}
+  "io.get-coursier" % name % version
+}
\ No newline at end of file
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/auto-scala-library/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/auto-scala-library/project/plugins.sbt
index 152225a9e..71a44ffd3 100644
--- a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/auto-scala-library/project/plugins.sbt
+++ b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/auto-scala-library/project/plugins.sbt
@@ -1,11 +1,13 @@
-{
-  val pluginVersion = sys.props.getOrElse(
+addSbtPlugin {
+
+  val name = sys.props.getOrElse(
+    "plugin.name",
+    sys.error("plugin.name Java property not set")
+  )
+  val version = sys.props.getOrElse(
     "plugin.version",
-    throw new RuntimeException(
-      """|The system property 'plugin.version' is not defined.
-         |Specify this property using the scriptedLaunchOpts -D.""".stripMargin
-    )
+    sys.error("plugin.version Java property not set")
   )
 
-  addSbtPlugin("io.get-coursier" % "sbt-coursier" % pluginVersion)
-}
+  "io.get-coursier" % name % version
+}
\ No newline at end of file
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/classifiers/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/classifiers/project/plugins.sbt
index 152225a9e..71a44ffd3 100644
--- a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/classifiers/project/plugins.sbt
+++ b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/classifiers/project/plugins.sbt
@@ -1,11 +1,13 @@
-{
-  val pluginVersion = sys.props.getOrElse(
+addSbtPlugin {
+
+  val name = sys.props.getOrElse(
+    "plugin.name",
+    sys.error("plugin.name Java property not set")
+  )
+  val version = sys.props.getOrElse(
     "plugin.version",
-    throw new RuntimeException(
-      """|The system property 'plugin.version' is not defined.
-         |Specify this property using the scriptedLaunchOpts -D.""".stripMargin
-    )
+    sys.error("plugin.version Java property not set")
   )
 
-  addSbtPlugin("io.get-coursier" % "sbt-coursier" % pluginVersion)
-}
+  "io.get-coursier" % name % version
+}
\ No newline at end of file
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/clean/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/clean/project/plugins.sbt
index 152225a9e..71a44ffd3 100644
--- a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/clean/project/plugins.sbt
+++ b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/clean/project/plugins.sbt
@@ -1,11 +1,13 @@
-{
-  val pluginVersion = sys.props.getOrElse(
+addSbtPlugin {
+
+  val name = sys.props.getOrElse(
+    "plugin.name",
+    sys.error("plugin.name Java property not set")
+  )
+  val version = sys.props.getOrElse(
     "plugin.version",
-    throw new RuntimeException(
-      """|The system property 'plugin.version' is not defined.
-         |Specify this property using the scriptedLaunchOpts -D.""".stripMargin
-    )
+    sys.error("plugin.version Java property not set")
   )
 
-  addSbtPlugin("io.get-coursier" % "sbt-coursier" % pluginVersion)
-}
+  "io.get-coursier" % name % version
+}
\ No newline at end of file
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/config-deps-resolution/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/config-deps-resolution/project/plugins.sbt
index 152225a9e..71a44ffd3 100644
--- a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/config-deps-resolution/project/plugins.sbt
+++ b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/config-deps-resolution/project/plugins.sbt
@@ -1,11 +1,13 @@
-{
-  val pluginVersion = sys.props.getOrElse(
+addSbtPlugin {
+
+  val name = sys.props.getOrElse(
+    "plugin.name",
+    sys.error("plugin.name Java property not set")
+  )
+  val version = sys.props.getOrElse(
     "plugin.version",
-    throw new RuntimeException(
-      """|The system property 'plugin.version' is not defined.
-         |Specify this property using the scriptedLaunchOpts -D.""".stripMargin
-    )
+    sys.error("plugin.version Java property not set")
   )
 
-  addSbtPlugin("io.get-coursier" % "sbt-coursier" % pluginVersion)
-}
+  "io.get-coursier" % name % version
+}
\ No newline at end of file
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/credentials-from-file/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/credentials-from-file/project/plugins.sbt
index 152225a9e..71a44ffd3 100644
--- a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/credentials-from-file/project/plugins.sbt
+++ b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/credentials-from-file/project/plugins.sbt
@@ -1,11 +1,13 @@
-{
-  val pluginVersion = sys.props.getOrElse(
+addSbtPlugin {
+
+  val name = sys.props.getOrElse(
+    "plugin.name",
+    sys.error("plugin.name Java property not set")
+  )
+  val version = sys.props.getOrElse(
     "plugin.version",
-    throw new RuntimeException(
-      """|The system property 'plugin.version' is not defined.
-         |Specify this property using the scriptedLaunchOpts -D.""".stripMargin
-    )
+    sys.error("plugin.version Java property not set")
   )
 
-  addSbtPlugin("io.get-coursier" % "sbt-coursier" % pluginVersion)
-}
+  "io.get-coursier" % name % version
+}
\ No newline at end of file
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/credentials-sbt/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/credentials-sbt/project/plugins.sbt
index 152225a9e..71a44ffd3 100644
--- a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/credentials-sbt/project/plugins.sbt
+++ b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/credentials-sbt/project/plugins.sbt
@@ -1,11 +1,13 @@
-{
-  val pluginVersion = sys.props.getOrElse(
+addSbtPlugin {
+
+  val name = sys.props.getOrElse(
+    "plugin.name",
+    sys.error("plugin.name Java property not set")
+  )
+  val version = sys.props.getOrElse(
     "plugin.version",
-    throw new RuntimeException(
-      """|The system property 'plugin.version' is not defined.
-         |Specify this property using the scriptedLaunchOpts -D.""".stripMargin
-    )
+    sys.error("plugin.version Java property not set")
   )
 
-  addSbtPlugin("io.get-coursier" % "sbt-coursier" % pluginVersion)
-}
+  "io.get-coursier" % name % version
+}
\ No newline at end of file
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/credentials/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/credentials/project/plugins.sbt
index 152225a9e..71a44ffd3 100644
--- a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/credentials/project/plugins.sbt
+++ b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/credentials/project/plugins.sbt
@@ -1,11 +1,13 @@
-{
-  val pluginVersion = sys.props.getOrElse(
+addSbtPlugin {
+
+  val name = sys.props.getOrElse(
+    "plugin.name",
+    sys.error("plugin.name Java property not set")
+  )
+  val version = sys.props.getOrElse(
     "plugin.version",
-    throw new RuntimeException(
-      """|The system property 'plugin.version' is not defined.
-         |Specify this property using the scriptedLaunchOpts -D.""".stripMargin
-    )
+    sys.error("plugin.version Java property not set")
   )
 
-  addSbtPlugin("io.get-coursier" % "sbt-coursier" % pluginVersion)
-}
+  "io.get-coursier" % name % version
+}
\ No newline at end of file
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/dependency-graph/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/dependency-graph/project/plugins.sbt
index 152225a9e..71a44ffd3 100644
--- a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/dependency-graph/project/plugins.sbt
+++ b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/dependency-graph/project/plugins.sbt
@@ -1,11 +1,13 @@
-{
-  val pluginVersion = sys.props.getOrElse(
+addSbtPlugin {
+
+  val name = sys.props.getOrElse(
+    "plugin.name",
+    sys.error("plugin.name Java property not set")
+  )
+  val version = sys.props.getOrElse(
     "plugin.version",
-    throw new RuntimeException(
-      """|The system property 'plugin.version' is not defined.
-         |Specify this property using the scriptedLaunchOpts -D.""".stripMargin
-    )
+    sys.error("plugin.version Java property not set")
   )
 
-  addSbtPlugin("io.get-coursier" % "sbt-coursier" % pluginVersion)
-}
+  "io.get-coursier" % name % version
+}
\ No newline at end of file
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/exclude-dependencies/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/exclude-dependencies/project/plugins.sbt
index 152225a9e..71a44ffd3 100644
--- a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/exclude-dependencies/project/plugins.sbt
+++ b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/exclude-dependencies/project/plugins.sbt
@@ -1,11 +1,13 @@
-{
-  val pluginVersion = sys.props.getOrElse(
+addSbtPlugin {
+
+  val name = sys.props.getOrElse(
+    "plugin.name",
+    sys.error("plugin.name Java property not set")
+  )
+  val version = sys.props.getOrElse(
     "plugin.version",
-    throw new RuntimeException(
-      """|The system property 'plugin.version' is not defined.
-         |Specify this property using the scriptedLaunchOpts -D.""".stripMargin
-    )
+    sys.error("plugin.version Java property not set")
   )
 
-  addSbtPlugin("io.get-coursier" % "sbt-coursier" % pluginVersion)
-}
+  "io.get-coursier" % name % version
+}
\ No newline at end of file
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/fallback-dependencies-inter-project/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/fallback-dependencies-inter-project/project/plugins.sbt
index 152225a9e..71a44ffd3 100644
--- a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/fallback-dependencies-inter-project/project/plugins.sbt
+++ b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/fallback-dependencies-inter-project/project/plugins.sbt
@@ -1,11 +1,13 @@
-{
-  val pluginVersion = sys.props.getOrElse(
+addSbtPlugin {
+
+  val name = sys.props.getOrElse(
+    "plugin.name",
+    sys.error("plugin.name Java property not set")
+  )
+  val version = sys.props.getOrElse(
     "plugin.version",
-    throw new RuntimeException(
-      """|The system property 'plugin.version' is not defined.
-         |Specify this property using the scriptedLaunchOpts -D.""".stripMargin
-    )
+    sys.error("plugin.version Java property not set")
   )
 
-  addSbtPlugin("io.get-coursier" % "sbt-coursier" % pluginVersion)
-}
+  "io.get-coursier" % name % version
+}
\ No newline at end of file
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/from-no-head/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/from-no-head/project/plugins.sbt
index 152225a9e..71a44ffd3 100644
--- a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/from-no-head/project/plugins.sbt
+++ b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/from-no-head/project/plugins.sbt
@@ -1,11 +1,13 @@
-{
-  val pluginVersion = sys.props.getOrElse(
+addSbtPlugin {
+
+  val name = sys.props.getOrElse(
+    "plugin.name",
+    sys.error("plugin.name Java property not set")
+  )
+  val version = sys.props.getOrElse(
     "plugin.version",
-    throw new RuntimeException(
-      """|The system property 'plugin.version' is not defined.
-         |Specify this property using the scriptedLaunchOpts -D.""".stripMargin
-    )
+    sys.error("plugin.version Java property not set")
   )
 
-  addSbtPlugin("io.get-coursier" % "sbt-coursier" % pluginVersion)
-}
+  "io.get-coursier" % name % version
+}
\ No newline at end of file
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/from-wrong-url/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/from-wrong-url/project/plugins.sbt
index 152225a9e..71a44ffd3 100644
--- a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/from-wrong-url/project/plugins.sbt
+++ b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/from-wrong-url/project/plugins.sbt
@@ -1,11 +1,13 @@
-{
-  val pluginVersion = sys.props.getOrElse(
+addSbtPlugin {
+
+  val name = sys.props.getOrElse(
+    "plugin.name",
+    sys.error("plugin.name Java property not set")
+  )
+  val version = sys.props.getOrElse(
     "plugin.version",
-    throw new RuntimeException(
-      """|The system property 'plugin.version' is not defined.
-         |Specify this property using the scriptedLaunchOpts -D.""".stripMargin
-    )
+    sys.error("plugin.version Java property not set")
   )
 
-  addSbtPlugin("io.get-coursier" % "sbt-coursier" % pluginVersion)
-}
+  "io.get-coursier" % name % version
+}
\ No newline at end of file
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/from/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/from/project/plugins.sbt
index 152225a9e..71a44ffd3 100644
--- a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/from/project/plugins.sbt
+++ b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/from/project/plugins.sbt
@@ -1,11 +1,13 @@
-{
-  val pluginVersion = sys.props.getOrElse(
+addSbtPlugin {
+
+  val name = sys.props.getOrElse(
+    "plugin.name",
+    sys.error("plugin.name Java property not set")
+  )
+  val version = sys.props.getOrElse(
     "plugin.version",
-    throw new RuntimeException(
-      """|The system property 'plugin.version' is not defined.
-         |Specify this property using the scriptedLaunchOpts -D.""".stripMargin
-    )
+    sys.error("plugin.version Java property not set")
   )
 
-  addSbtPlugin("io.get-coursier" % "sbt-coursier" % pluginVersion)
-}
+  "io.get-coursier" % name % version
+}
\ No newline at end of file
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/hadoop-yarn-server-resourcemanager/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/hadoop-yarn-server-resourcemanager/project/plugins.sbt
index 152225a9e..71a44ffd3 100644
--- a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/hadoop-yarn-server-resourcemanager/project/plugins.sbt
+++ b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/hadoop-yarn-server-resourcemanager/project/plugins.sbt
@@ -1,11 +1,13 @@
-{
-  val pluginVersion = sys.props.getOrElse(
+addSbtPlugin {
+
+  val name = sys.props.getOrElse(
+    "plugin.name",
+    sys.error("plugin.name Java property not set")
+  )
+  val version = sys.props.getOrElse(
     "plugin.version",
-    throw new RuntimeException(
-      """|The system property 'plugin.version' is not defined.
-         |Specify this property using the scriptedLaunchOpts -D.""".stripMargin
-    )
+    sys.error("plugin.version Java property not set")
   )
 
-  addSbtPlugin("io.get-coursier" % "sbt-coursier" % pluginVersion)
-}
+  "io.get-coursier" % name % version
+}
\ No newline at end of file
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/in-memory-cache/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/in-memory-cache/project/plugins.sbt
index 152225a9e..71a44ffd3 100644
--- a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/in-memory-cache/project/plugins.sbt
+++ b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/in-memory-cache/project/plugins.sbt
@@ -1,11 +1,13 @@
-{
-  val pluginVersion = sys.props.getOrElse(
+addSbtPlugin {
+
+  val name = sys.props.getOrElse(
+    "plugin.name",
+    sys.error("plugin.name Java property not set")
+  )
+  val version = sys.props.getOrElse(
     "plugin.version",
-    throw new RuntimeException(
-      """|The system property 'plugin.version' is not defined.
-         |Specify this property using the scriptedLaunchOpts -D.""".stripMargin
-    )
+    sys.error("plugin.version Java property not set")
   )
 
-  addSbtPlugin("io.get-coursier" % "sbt-coursier" % pluginVersion)
-}
+  "io.get-coursier" % name % version
+}
\ No newline at end of file
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/inter-project-resolvers/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/inter-project-resolvers/project/plugins.sbt
index 152225a9e..71a44ffd3 100644
--- a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/inter-project-resolvers/project/plugins.sbt
+++ b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/inter-project-resolvers/project/plugins.sbt
@@ -1,11 +1,13 @@
-{
-  val pluginVersion = sys.props.getOrElse(
+addSbtPlugin {
+
+  val name = sys.props.getOrElse(
+    "plugin.name",
+    sys.error("plugin.name Java property not set")
+  )
+  val version = sys.props.getOrElse(
     "plugin.version",
-    throw new RuntimeException(
-      """|The system property 'plugin.version' is not defined.
-         |Specify this property using the scriptedLaunchOpts -D.""".stripMargin
-    )
+    sys.error("plugin.version Java property not set")
   )
 
-  addSbtPlugin("io.get-coursier" % "sbt-coursier" % pluginVersion)
-}
+  "io.get-coursier" % name % version
+}
\ No newline at end of file
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/inter-project/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/inter-project/project/plugins.sbt
index 152225a9e..71a44ffd3 100644
--- a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/inter-project/project/plugins.sbt
+++ b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/inter-project/project/plugins.sbt
@@ -1,11 +1,13 @@
-{
-  val pluginVersion = sys.props.getOrElse(
+addSbtPlugin {
+
+  val name = sys.props.getOrElse(
+    "plugin.name",
+    sys.error("plugin.name Java property not set")
+  )
+  val version = sys.props.getOrElse(
     "plugin.version",
-    throw new RuntimeException(
-      """|The system property 'plugin.version' is not defined.
-         |Specify this property using the scriptedLaunchOpts -D.""".stripMargin
-    )
+    sys.error("plugin.version Java property not set")
   )
 
-  addSbtPlugin("io.get-coursier" % "sbt-coursier" % pluginVersion)
-}
+  "io.get-coursier" % name % version
+}
\ No newline at end of file
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/logger/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/logger/project/plugins.sbt
index 152225a9e..71a44ffd3 100644
--- a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/logger/project/plugins.sbt
+++ b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/logger/project/plugins.sbt
@@ -1,11 +1,13 @@
-{
-  val pluginVersion = sys.props.getOrElse(
+addSbtPlugin {
+
+  val name = sys.props.getOrElse(
+    "plugin.name",
+    sys.error("plugin.name Java property not set")
+  )
+  val version = sys.props.getOrElse(
     "plugin.version",
-    throw new RuntimeException(
-      """|The system property 'plugin.version' is not defined.
-         |Specify this property using the scriptedLaunchOpts -D.""".stripMargin
-    )
+    sys.error("plugin.version Java property not set")
   )
 
-  addSbtPlugin("io.get-coursier" % "sbt-coursier" % pluginVersion)
-}
+  "io.get-coursier" % name % version
+}
\ No newline at end of file
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/maven-compatible/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/maven-compatible/project/plugins.sbt
index 152225a9e..71a44ffd3 100644
--- a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/maven-compatible/project/plugins.sbt
+++ b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/maven-compatible/project/plugins.sbt
@@ -1,11 +1,13 @@
-{
-  val pluginVersion = sys.props.getOrElse(
+addSbtPlugin {
+
+  val name = sys.props.getOrElse(
+    "plugin.name",
+    sys.error("plugin.name Java property not set")
+  )
+  val version = sys.props.getOrElse(
     "plugin.version",
-    throw new RuntimeException(
-      """|The system property 'plugin.version' is not defined.
-         |Specify this property using the scriptedLaunchOpts -D.""".stripMargin
-    )
+    sys.error("plugin.version Java property not set")
   )
 
-  addSbtPlugin("io.get-coursier" % "sbt-coursier" % pluginVersion)
-}
+  "io.get-coursier" % name % version
+}
\ No newline at end of file
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/missing-credentials/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/missing-credentials/project/plugins.sbt
index 152225a9e..71a44ffd3 100644
--- a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/missing-credentials/project/plugins.sbt
+++ b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/missing-credentials/project/plugins.sbt
@@ -1,11 +1,13 @@
-{
-  val pluginVersion = sys.props.getOrElse(
+addSbtPlugin {
+
+  val name = sys.props.getOrElse(
+    "plugin.name",
+    sys.error("plugin.name Java property not set")
+  )
+  val version = sys.props.getOrElse(
     "plugin.version",
-    throw new RuntimeException(
-      """|The system property 'plugin.version' is not defined.
-         |Specify this property using the scriptedLaunchOpts -D.""".stripMargin
-    )
+    sys.error("plugin.version Java property not set")
   )
 
-  addSbtPlugin("io.get-coursier" % "sbt-coursier" % pluginVersion)
-}
+  "io.get-coursier" % name % version
+}
\ No newline at end of file
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/neo-sbt-scalafmt/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/neo-sbt-scalafmt/project/plugins.sbt
index 152225a9e..71a44ffd3 100644
--- a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/neo-sbt-scalafmt/project/plugins.sbt
+++ b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/neo-sbt-scalafmt/project/plugins.sbt
@@ -1,11 +1,13 @@
-{
-  val pluginVersion = sys.props.getOrElse(
+addSbtPlugin {
+
+  val name = sys.props.getOrElse(
+    "plugin.name",
+    sys.error("plugin.name Java property not set")
+  )
+  val version = sys.props.getOrElse(
     "plugin.version",
-    throw new RuntimeException(
-      """|The system property 'plugin.version' is not defined.
-         |Specify this property using the scriptedLaunchOpts -D.""".stripMargin
-    )
+    sys.error("plugin.version Java property not set")
   )
 
-  addSbtPlugin("io.get-coursier" % "sbt-coursier" % pluginVersion)
-}
+  "io.get-coursier" % name % version
+}
\ No newline at end of file
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/no-pom-artifact/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/no-pom-artifact/project/plugins.sbt
index 152225a9e..71a44ffd3 100644
--- a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/no-pom-artifact/project/plugins.sbt
+++ b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/no-pom-artifact/project/plugins.sbt
@@ -1,11 +1,13 @@
-{
-  val pluginVersion = sys.props.getOrElse(
+addSbtPlugin {
+
+  val name = sys.props.getOrElse(
+    "plugin.name",
+    sys.error("plugin.name Java property not set")
+  )
+  val version = sys.props.getOrElse(
     "plugin.version",
-    throw new RuntimeException(
-      """|The system property 'plugin.version' is not defined.
-         |Specify this property using the scriptedLaunchOpts -D.""".stripMargin
-    )
+    sys.error("plugin.version Java property not set")
   )
 
-  addSbtPlugin("io.get-coursier" % "sbt-coursier" % pluginVersion)
-}
+  "io.get-coursier" % name % version
+}
\ No newline at end of file
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/profiles/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/profiles/project/plugins.sbt
index 152225a9e..71a44ffd3 100644
--- a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/profiles/project/plugins.sbt
+++ b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/profiles/project/plugins.sbt
@@ -1,11 +1,13 @@
-{
-  val pluginVersion = sys.props.getOrElse(
+addSbtPlugin {
+
+  val name = sys.props.getOrElse(
+    "plugin.name",
+    sys.error("plugin.name Java property not set")
+  )
+  val version = sys.props.getOrElse(
     "plugin.version",
-    throw new RuntimeException(
-      """|The system property 'plugin.version' is not defined.
-         |Specify this property using the scriptedLaunchOpts -D.""".stripMargin
-    )
+    sys.error("plugin.version Java property not set")
   )
 
-  addSbtPlugin("io.get-coursier" % "sbt-coursier" % pluginVersion)
-}
+  "io.get-coursier" % name % version
+}
\ No newline at end of file
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/publish-local-signed/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/publish-local-signed/project/plugins.sbt
index 152225a9e..71a44ffd3 100644
--- a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/publish-local-signed/project/plugins.sbt
+++ b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/publish-local-signed/project/plugins.sbt
@@ -1,11 +1,13 @@
-{
-  val pluginVersion = sys.props.getOrElse(
+addSbtPlugin {
+
+  val name = sys.props.getOrElse(
+    "plugin.name",
+    sys.error("plugin.name Java property not set")
+  )
+  val version = sys.props.getOrElse(
     "plugin.version",
-    throw new RuntimeException(
-      """|The system property 'plugin.version' is not defined.
-         |Specify this property using the scriptedLaunchOpts -D.""".stripMargin
-    )
+    sys.error("plugin.version Java property not set")
   )
 
-  addSbtPlugin("io.get-coursier" % "sbt-coursier" % pluginVersion)
-}
+  "io.get-coursier" % name % version
+}
\ No newline at end of file
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/publish-local-sources-javadoc-conf/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/publish-local-sources-javadoc-conf/project/plugins.sbt
index 152225a9e..71a44ffd3 100644
--- a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/publish-local-sources-javadoc-conf/project/plugins.sbt
+++ b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/publish-local-sources-javadoc-conf/project/plugins.sbt
@@ -1,11 +1,13 @@
-{
-  val pluginVersion = sys.props.getOrElse(
+addSbtPlugin {
+
+  val name = sys.props.getOrElse(
+    "plugin.name",
+    sys.error("plugin.name Java property not set")
+  )
+  val version = sys.props.getOrElse(
     "plugin.version",
-    throw new RuntimeException(
-      """|The system property 'plugin.version' is not defined.
-         |Specify this property using the scriptedLaunchOpts -D.""".stripMargin
-    )
+    sys.error("plugin.version Java property not set")
   )
 
-  addSbtPlugin("io.get-coursier" % "sbt-coursier" % pluginVersion)
-}
+  "io.get-coursier" % name % version
+}
\ No newline at end of file
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/sbt-assembly/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/sbt-assembly/project/plugins.sbt
index 152225a9e..71a44ffd3 100644
--- a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/sbt-assembly/project/plugins.sbt
+++ b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/sbt-assembly/project/plugins.sbt
@@ -1,11 +1,13 @@
-{
-  val pluginVersion = sys.props.getOrElse(
+addSbtPlugin {
+
+  val name = sys.props.getOrElse(
+    "plugin.name",
+    sys.error("plugin.name Java property not set")
+  )
+  val version = sys.props.getOrElse(
     "plugin.version",
-    throw new RuntimeException(
-      """|The system property 'plugin.version' is not defined.
-         |Specify this property using the scriptedLaunchOpts -D.""".stripMargin
-    )
+    sys.error("plugin.version Java property not set")
   )
 
-  addSbtPlugin("io.get-coursier" % "sbt-coursier" % pluginVersion)
-}
+  "io.get-coursier" % name % version
+}
\ No newline at end of file
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/scala-jars/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/scala-jars/project/plugins.sbt
index 152225a9e..71a44ffd3 100644
--- a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/scala-jars/project/plugins.sbt
+++ b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/scala-jars/project/plugins.sbt
@@ -1,11 +1,13 @@
-{
-  val pluginVersion = sys.props.getOrElse(
+addSbtPlugin {
+
+  val name = sys.props.getOrElse(
+    "plugin.name",
+    sys.error("plugin.name Java property not set")
+  )
+  val version = sys.props.getOrElse(
     "plugin.version",
-    throw new RuntimeException(
-      """|The system property 'plugin.version' is not defined.
-         |Specify this property using the scriptedLaunchOpts -D.""".stripMargin
-    )
+    sys.error("plugin.version Java property not set")
   )
 
-  addSbtPlugin("io.get-coursier" % "sbt-coursier" % pluginVersion)
-}
+  "io.get-coursier" % name % version
+}
\ No newline at end of file
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/scala-js/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/scala-js/project/plugins.sbt
index 152225a9e..71a44ffd3 100644
--- a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/scala-js/project/plugins.sbt
+++ b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/scala-js/project/plugins.sbt
@@ -1,11 +1,13 @@
-{
-  val pluginVersion = sys.props.getOrElse(
+addSbtPlugin {
+
+  val name = sys.props.getOrElse(
+    "plugin.name",
+    sys.error("plugin.name Java property not set")
+  )
+  val version = sys.props.getOrElse(
     "plugin.version",
-    throw new RuntimeException(
-      """|The system property 'plugin.version' is not defined.
-         |Specify this property using the scriptedLaunchOpts -D.""".stripMargin
-    )
+    sys.error("plugin.version Java property not set")
   )
 
-  addSbtPlugin("io.get-coursier" % "sbt-coursier" % pluginVersion)
-}
+  "io.get-coursier" % name % version
+}
\ No newline at end of file
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/scala-sources-javadoc-jars/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/scala-sources-javadoc-jars/project/plugins.sbt
index 152225a9e..71a44ffd3 100644
--- a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/scala-sources-javadoc-jars/project/plugins.sbt
+++ b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/scala-sources-javadoc-jars/project/plugins.sbt
@@ -1,11 +1,13 @@
-{
-  val pluginVersion = sys.props.getOrElse(
+addSbtPlugin {
+
+  val name = sys.props.getOrElse(
+    "plugin.name",
+    sys.error("plugin.name Java property not set")
+  )
+  val version = sys.props.getOrElse(
     "plugin.version",
-    throw new RuntimeException(
-      """|The system property 'plugin.version' is not defined.
-         |Specify this property using the scriptedLaunchOpts -D.""".stripMargin
-    )
+    sys.error("plugin.version Java property not set")
   )
 
-  addSbtPlugin("io.get-coursier" % "sbt-coursier" % pluginVersion)
-}
+  "io.get-coursier" % name % version
+}
\ No newline at end of file
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/simple/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/simple/project/plugins.sbt
index 152225a9e..71a44ffd3 100644
--- a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/simple/project/plugins.sbt
+++ b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/simple/project/plugins.sbt
@@ -1,11 +1,13 @@
-{
-  val pluginVersion = sys.props.getOrElse(
+addSbtPlugin {
+
+  val name = sys.props.getOrElse(
+    "plugin.name",
+    sys.error("plugin.name Java property not set")
+  )
+  val version = sys.props.getOrElse(
     "plugin.version",
-    throw new RuntimeException(
-      """|The system property 'plugin.version' is not defined.
-         |Specify this property using the scriptedLaunchOpts -D.""".stripMargin
-    )
+    sys.error("plugin.version Java property not set")
   )
 
-  addSbtPlugin("io.get-coursier" % "sbt-coursier" % pluginVersion)
-}
+  "io.get-coursier" % name % version
+}
\ No newline at end of file
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/tests-classifier/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/tests-classifier/project/plugins.sbt
index 152225a9e..71a44ffd3 100644
--- a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/tests-classifier/project/plugins.sbt
+++ b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/tests-classifier/project/plugins.sbt
@@ -1,11 +1,13 @@
-{
-  val pluginVersion = sys.props.getOrElse(
+addSbtPlugin {
+
+  val name = sys.props.getOrElse(
+    "plugin.name",
+    sys.error("plugin.name Java property not set")
+  )
+  val version = sys.props.getOrElse(
     "plugin.version",
-    throw new RuntimeException(
-      """|The system property 'plugin.version' is not defined.
-         |Specify this property using the scriptedLaunchOpts -D.""".stripMargin
-    )
+    sys.error("plugin.version Java property not set")
   )
 
-  addSbtPlugin("io.get-coursier" % "sbt-coursier" % pluginVersion)
-}
+  "io.get-coursier" % name % version
+}
\ No newline at end of file
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/typelevel-force-version-stdlib/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/typelevel-force-version-stdlib/project/plugins.sbt
index 152225a9e..71a44ffd3 100644
--- a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/typelevel-force-version-stdlib/project/plugins.sbt
+++ b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/typelevel-force-version-stdlib/project/plugins.sbt
@@ -1,11 +1,13 @@
-{
-  val pluginVersion = sys.props.getOrElse(
+addSbtPlugin {
+
+  val name = sys.props.getOrElse(
+    "plugin.name",
+    sys.error("plugin.name Java property not set")
+  )
+  val version = sys.props.getOrElse(
     "plugin.version",
-    throw new RuntimeException(
-      """|The system property 'plugin.version' is not defined.
-         |Specify this property using the scriptedLaunchOpts -D.""".stripMargin
-    )
+    sys.error("plugin.version Java property not set")
   )
 
-  addSbtPlugin("io.get-coursier" % "sbt-coursier" % pluginVersion)
-}
+  "io.get-coursier" % name % version
+}
\ No newline at end of file
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/typelevel-with-dependencies/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/typelevel-with-dependencies/project/plugins.sbt
index 152225a9e..71a44ffd3 100644
--- a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/typelevel-with-dependencies/project/plugins.sbt
+++ b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/typelevel-with-dependencies/project/plugins.sbt
@@ -1,11 +1,13 @@
-{
-  val pluginVersion = sys.props.getOrElse(
+addSbtPlugin {
+
+  val name = sys.props.getOrElse(
+    "plugin.name",
+    sys.error("plugin.name Java property not set")
+  )
+  val version = sys.props.getOrElse(
     "plugin.version",
-    throw new RuntimeException(
-      """|The system property 'plugin.version' is not defined.
-         |Specify this property using the scriptedLaunchOpts -D.""".stripMargin
-    )
+    sys.error("plugin.version Java property not set")
   )
 
-  addSbtPlugin("io.get-coursier" % "sbt-coursier" % pluginVersion)
-}
+  "io.get-coursier" % name % version
+}
\ No newline at end of file
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/typelevel/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/typelevel/project/plugins.sbt
index 152225a9e..71a44ffd3 100644
--- a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/typelevel/project/plugins.sbt
+++ b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/typelevel/project/plugins.sbt
@@ -1,11 +1,13 @@
-{
-  val pluginVersion = sys.props.getOrElse(
+addSbtPlugin {
+
+  val name = sys.props.getOrElse(
+    "plugin.name",
+    sys.error("plugin.name Java property not set")
+  )
+  val version = sys.props.getOrElse(
     "plugin.version",
-    throw new RuntimeException(
-      """|The system property 'plugin.version' is not defined.
-         |Specify this property using the scriptedLaunchOpts -D.""".stripMargin
-    )
+    sys.error("plugin.version Java property not set")
   )
 
-  addSbtPlugin("io.get-coursier" % "sbt-coursier" % pluginVersion)
-}
+  "io.get-coursier" % name % version
+}
\ No newline at end of file
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/unidoc/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/unidoc/project/plugins.sbt
index 152225a9e..71a44ffd3 100644
--- a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/unidoc/project/plugins.sbt
+++ b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/unidoc/project/plugins.sbt
@@ -1,11 +1,13 @@
-{
-  val pluginVersion = sys.props.getOrElse(
+addSbtPlugin {
+
+  val name = sys.props.getOrElse(
+    "plugin.name",
+    sys.error("plugin.name Java property not set")
+  )
+  val version = sys.props.getOrElse(
     "plugin.version",
-    throw new RuntimeException(
-      """|The system property 'plugin.version' is not defined.
-         |Specify this property using the scriptedLaunchOpts -D.""".stripMargin
-    )
+    sys.error("plugin.version Java property not set")
   )
 
-  addSbtPlugin("io.get-coursier" % "sbt-coursier" % pluginVersion)
-}
+  "io.get-coursier" % name % version
+}
\ No newline at end of file
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/update-sbt-classifiers/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/update-sbt-classifiers/project/plugins.sbt
index 152225a9e..71a44ffd3 100644
--- a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/update-sbt-classifiers/project/plugins.sbt
+++ b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/update-sbt-classifiers/project/plugins.sbt
@@ -1,11 +1,13 @@
-{
-  val pluginVersion = sys.props.getOrElse(
+addSbtPlugin {
+
+  val name = sys.props.getOrElse(
+    "plugin.name",
+    sys.error("plugin.name Java property not set")
+  )
+  val version = sys.props.getOrElse(
     "plugin.version",
-    throw new RuntimeException(
-      """|The system property 'plugin.version' is not defined.
-         |Specify this property using the scriptedLaunchOpts -D.""".stripMargin
-    )
+    sys.error("plugin.version Java property not set")
   )
 
-  addSbtPlugin("io.get-coursier" % "sbt-coursier" % pluginVersion)
-}
+  "io.get-coursier" % name % version
+}
\ No newline at end of file
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/zookeeper/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/zookeeper/project/plugins.sbt
index 152225a9e..71a44ffd3 100644
--- a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/zookeeper/project/plugins.sbt
+++ b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/zookeeper/project/plugins.sbt
@@ -1,11 +1,13 @@
-{
-  val pluginVersion = sys.props.getOrElse(
+addSbtPlugin {
+
+  val name = sys.props.getOrElse(
+    "plugin.name",
+    sys.error("plugin.name Java property not set")
+  )
+  val version = sys.props.getOrElse(
     "plugin.version",
-    throw new RuntimeException(
-      """|The system property 'plugin.version' is not defined.
-         |Specify this property using the scriptedLaunchOpts -D.""".stripMargin
-    )
+    sys.error("plugin.version Java property not set")
   )
 
-  addSbtPlugin("io.get-coursier" % "sbt-coursier" % pluginVersion)
-}
+  "io.get-coursier" % name % version
+}
\ No newline at end of file
diff --git a/project/Settings.scala b/project/Settings.scala
index 7a3687849..44b387f80 100644
--- a/project/Settings.scala
+++ b/project/Settings.scala
@@ -29,6 +29,7 @@ object Settings {
     Seq(
       scriptedLaunchOpts ++= Seq(
         "-Xmx1024M",
+        "-Dplugin.name=" + name.value,
         "-Dplugin.version=" + version.value,
         "-Dsbttest.base=" + (sourceDirectory.value / "sbt-test").getAbsolutePath
       ),