diff --git a/instrumentation/runner/src/main/kotlin/de/mannodermaus/junit5/internal/runners/AndroidJUnitFramework.kt b/instrumentation/runner/src/main/kotlin/de/mannodermaus/junit5/internal/runners/AndroidJUnitFramework.kt
index 394a2f58..664497e7 100644
--- a/instrumentation/runner/src/main/kotlin/de/mannodermaus/junit5/internal/runners/AndroidJUnitFramework.kt
+++ b/instrumentation/runner/src/main/kotlin/de/mannodermaus/junit5/internal/runners/AndroidJUnitFramework.kt
@@ -1,7 +1,9 @@
 package de.mannodermaus.junit5.internal.runners
 
+import android.util.Log
 import androidx.annotation.RequiresApi
 import androidx.annotation.VisibleForTesting
+import de.mannodermaus.junit5.internal.LOG_TAG
 import de.mannodermaus.junit5.internal.discovery.EmptyTestPlan
 import de.mannodermaus.junit5.internal.runners.notification.ParallelRunNotifier
 import org.junit.platform.commons.JUnitException
@@ -36,6 +38,7 @@ internal class AndroidJUnitFramework(
 
     override fun run(notifier: RunNotifier) {
         testTree?.let { tree ->
+            Log.v(LOG_TAG, "run($testClass)")
             launcher.execute(
                 tree.testPlan,
                 AndroidJUnitPlatformRunnerListener(tree, tree.createNotifier(notifier)),
diff --git a/plugin/android-junit5/src/main/kotlin/de/mannodermaus/gradle/plugins/junit5/AndroidJUnitPlatformPlugin.kt b/plugin/android-junit5/src/main/kotlin/de/mannodermaus/gradle/plugins/junit5/AndroidJUnitPlatformPlugin.kt
index fbac0ede..a5daa249 100644
--- a/plugin/android-junit5/src/main/kotlin/de/mannodermaus/gradle/plugins/junit5/AndroidJUnitPlatformPlugin.kt
+++ b/plugin/android-junit5/src/main/kotlin/de/mannodermaus/gradle/plugins/junit5/AndroidJUnitPlatformPlugin.kt
@@ -18,7 +18,7 @@ public class AndroidJUnitPlatformPlugin : Plugin<Project> {
             whenAndroidPluginAdded { plugin ->
                 PluginConfig.find(this, plugin)?.let { config ->
                     require(config.currentAgpVersion >= MIN_REQUIRED_AGP_VERSION) {
-                        "android-junit5 plugin requires Android Gradle Plugin $MIN_REQUIRED_AGP_VERSION or later"
+                        "android-junit plugin requires Android Gradle Plugin $MIN_REQUIRED_AGP_VERSION or later"
                     }
 
                     configureJUnitFramework(config)
diff --git a/plugin/android-junit5/src/main/kotlin/de/mannodermaus/gradle/plugins/junit5/internal/config/Constants.kt b/plugin/android-junit5/src/main/kotlin/de/mannodermaus/gradle/plugins/junit5/internal/config/Constants.kt
index c19f3958..873300cf 100644
--- a/plugin/android-junit5/src/main/kotlin/de/mannodermaus/gradle/plugins/junit5/internal/config/Constants.kt
+++ b/plugin/android-junit5/src/main/kotlin/de/mannodermaus/gradle/plugins/junit5/internal/config/Constants.kt
@@ -11,8 +11,8 @@ internal val MIN_REQUIRED_AGP_VERSION = AndroidPluginVersion(8, 2)
 
 internal const val EXTENSION_NAME = "junitPlatform"
 
-internal const val ANDROID_JUNIT5_RUNNER_BUILDER_CLASS =
-    "de.mannodermaus.junit5.AndroidJUnit5Builder"
+internal const val ANDROID_JUNIT_RUNNER_BUILDER_CLASS =
+    "de.mannodermaus.junit5.AndroidJUnitFrameworkBuilder"
 internal const val INSTRUMENTATION_RUNNER_LIBRARY_GROUP = "de.mannodermaus.junit5"
 internal const val INSTRUMENTATION_RUNNER_LIBRARY_ARTIFACT = "android-test-runner"
 
diff --git a/plugin/android-junit5/src/main/kotlin/de/mannodermaus/gradle/plugins/junit5/internal/configure.kt b/plugin/android-junit5/src/main/kotlin/de/mannodermaus/gradle/plugins/junit5/internal/configure.kt
index 4ef352fc..09a668ce 100644
--- a/plugin/android-junit5/src/main/kotlin/de/mannodermaus/gradle/plugins/junit5/internal/configure.kt
+++ b/plugin/android-junit5/src/main/kotlin/de/mannodermaus/gradle/plugins/junit5/internal/configure.kt
@@ -9,7 +9,7 @@ import com.android.builder.core.ComponentType.Companion.UNIT_TEST_SUFFIX
 import de.mannodermaus.Libraries
 import de.mannodermaus.Libraries.Instrumentation
 import de.mannodermaus.gradle.plugins.junit5.dsl.AndroidJUnitPlatformExtension
-import de.mannodermaus.gradle.plugins.junit5.internal.config.ANDROID_JUNIT5_RUNNER_BUILDER_CLASS
+import de.mannodermaus.gradle.plugins.junit5.internal.config.ANDROID_JUNIT_RUNNER_BUILDER_CLASS
 import de.mannodermaus.gradle.plugins.junit5.internal.config.EXTENSION_NAME
 import de.mannodermaus.gradle.plugins.junit5.internal.config.JUnitPlatformTaskConfig
 import de.mannodermaus.gradle.plugins.junit5.internal.config.PluginConfig
@@ -118,11 +118,11 @@ private fun AndroidJUnitPlatformExtension.prepareInstrumentationTests(
 
     // Attach the JUnit 5 RunnerBuilder to the list, unless it's already added
     val runnerBuilders = runnerArgs.getAsList("runnerBuilder")
-    if (ANDROID_JUNIT5_RUNNER_BUILDER_CLASS !in runnerBuilders) {
+    if (ANDROID_JUNIT_RUNNER_BUILDER_CLASS !in runnerBuilders) {
         runnerArgs["runnerBuilder"] =
             runnerBuilders
                 .toMutableList()
-                .also { it.add(ANDROID_JUNIT5_RUNNER_BUILDER_CLASS) }
+                .also { it.add(ANDROID_JUNIT_RUNNER_BUILDER_CLASS) }
                 .joinToString(",")
     }
 
@@ -141,6 +141,8 @@ private fun AndroidJUnitPlatformExtension.prepareInstrumentationTests(
 }
 
 private fun MutableMap<String, String>.addConfigurationParameters(values: Map<String, String>) {
+    if (values.isEmpty()) return
+
     val instrumentationParams = this.getAsList("configurationParameters").toMutableList()
     values.forEach { (key, value) -> instrumentationParams.add("$key=$value") }
     this["configurationParameters"] = instrumentationParams.joinToString(",")
diff --git a/plugin/android-junit5/src/test/kotlin/de/mannodermaus/gradle/plugins/junit5/plugin/InstrumentationSupportTests.kt b/plugin/android-junit5/src/test/kotlin/de/mannodermaus/gradle/plugins/junit5/plugin/InstrumentationSupportTests.kt
index c6cef0e7..c32cb8f6 100644
--- a/plugin/android-junit5/src/test/kotlin/de/mannodermaus/gradle/plugins/junit5/plugin/InstrumentationSupportTests.kt
+++ b/plugin/android-junit5/src/test/kotlin/de/mannodermaus/gradle/plugins/junit5/plugin/InstrumentationSupportTests.kt
@@ -7,7 +7,7 @@ import de.mannodermaus.Libraries.JUnit.JUnit5
 import de.mannodermaus.gradle.plugins.junit5.dsl.UnsupportedDeviceBehavior
 import de.mannodermaus.gradle.plugins.junit5.extensions.android
 import de.mannodermaus.gradle.plugins.junit5.internal.artifact
-import de.mannodermaus.gradle.plugins.junit5.internal.config.ANDROID_JUNIT5_RUNNER_BUILDER_CLASS
+import de.mannodermaus.gradle.plugins.junit5.internal.config.ANDROID_JUNIT_RUNNER_BUILDER_CLASS
 import de.mannodermaus.gradle.plugins.junit5.internal.extensions.junitPlatform
 import de.mannodermaus.gradle.plugins.junit5.util.assertThat
 import de.mannodermaus.gradle.plugins.junit5.util.evaluate
@@ -40,7 +40,7 @@ internal class InstrumentationSupportTests {
         assertThat(
                 project.android.defaultConfig.testInstrumentationRunnerArguments["runnerBuilder"]
             )
-            .isEqualTo(ANDROID_JUNIT5_RUNNER_BUILDER_CLASS)
+            .isEqualTo(ANDROID_JUNIT_RUNNER_BUILDER_CLASS)
     }
 
     @Test
@@ -53,7 +53,7 @@ internal class InstrumentationSupportTests {
         assertThat(
                 project.android.defaultConfig.testInstrumentationRunnerArguments["runnerBuilder"]
             )
-            .isEqualTo("something.else,$ANDROID_JUNIT5_RUNNER_BUILDER_CLASS")
+            .isEqualTo("something.else,$ANDROID_JUNIT_RUNNER_BUILDER_CLASS")
     }
 
     @Test