diff --git a/dd-java-agent/instrumentation/java-security/src/test/groovy/test/WeakCipherTest.groovy b/dd-java-agent/instrumentation/java-security/src/test/groovy/test/WeakCipherTest.groovy
index 1c9e5639841..8a9f99c327c 100644
--- a/dd-java-agent/instrumentation/java-security/src/test/groovy/test/WeakCipherTest.groovy
+++ b/dd-java-agent/instrumentation/java-security/src/test/groovy/test/WeakCipherTest.groovy
@@ -63,7 +63,7 @@ class WeakCipherTest extends AgentTestRunner {
   }
 
   // Key Generator
-  def "test weak cipher instrumentation"() {
+  def "test weak keygen instrumentation"() {
     setup:
     WeakCipherModule module = Mock(WeakCipherModule)
     InstrumentationBridge.registerIastModule(module)
@@ -75,7 +75,7 @@ class WeakCipherTest extends AgentTestRunner {
     1 * module.onCipherAlgorithm(_)
   }
 
-  def "test weak cipher instrumentation with provider"() {
+  def "test weak keygen instrumentation with provider"() {
     setup:
     WeakCipherModule module = Mock(WeakCipherModule)
     InstrumentationBridge.registerIastModule(module)
@@ -88,7 +88,7 @@ class WeakCipherTest extends AgentTestRunner {
     1 * module.onCipherAlgorithm(_)
   }
 
-  def "test weak cipher instrumentation with provider string"() {
+  def "test weak keygen instrumentation with provider string"() {
     setup:
     WeakCipherModule module = Mock(WeakCipherModule)
     InstrumentationBridge.registerIastModule(module)
diff --git a/dd-trace-core/src/test/groovy/datadog/trace/common/sampling/SamplerTest.groovy b/dd-trace-core/src/test/groovy/datadog/trace/common/sampling/SamplerTest.groovy
index 2ae8987718c..706f45ea43f 100644
--- a/dd-trace-core/src/test/groovy/datadog/trace/common/sampling/SamplerTest.groovy
+++ b/dd-trace-core/src/test/groovy/datadog/trace/common/sampling/SamplerTest.groovy
@@ -56,7 +56,7 @@ class SamplerTest extends DDSpecification{
     !(sampler instanceof AsmStandaloneSampler)
   }
 
-  void "test that AsmStandaloneSampler is not selected when apm tracing and asm not enabled"() {
+  void "test that AsmStandaloneSampler is not selected when apm tracing enabled and asm not enabled"() {
     setup:
     Config config = new Config()
 
diff --git a/dd-trace-core/src/test/groovy/datadog/trace/common/writer/PrioritizationTest.groovy b/dd-trace-core/src/test/groovy/datadog/trace/common/writer/PrioritizationTest.groovy
index 9f7d5c6e16f..8fa2f08eaa1 100644
--- a/dd-trace-core/src/test/groovy/datadog/trace/common/writer/PrioritizationTest.groovy
+++ b/dd-trace-core/src/test/groovy/datadog/trace/common/writer/PrioritizationTest.groovy
@@ -230,7 +230,7 @@ class PrioritizationTest extends DDSpecification {
     []    | USER_KEEP    | 1             | 0                | ENQUEUED_FOR_SERIALIZATION
   }
 
-  def "drop strategy respects force keep" () {
+  def "span sampling drop strategy respects force keep" () {
     setup:
     Queue<Object> primary = Mock(Queue)
     Queue<Object> spanSampling = Mock(Queue)
diff --git a/telemetry/src/test/groovy/datadog/telemetry/TelemetryRouterSpecification.groovy b/telemetry/src/test/groovy/datadog/telemetry/TelemetryRouterSpecification.groovy
index de108fa85d1..fe3687ba703 100644
--- a/telemetry/src/test/groovy/datadog/telemetry/TelemetryRouterSpecification.groovy
+++ b/telemetry/src/test/groovy/datadog/telemetry/TelemetryRouterSpecification.groovy
@@ -329,7 +329,7 @@ class TelemetryRouterSpecification extends Specification {
     500        | null           | agentTelemetryUrl
   }
 
-  def 'switch to Intake when Agent fails to receive telemetry requests'() {
+  def 'switch to Intake then back to Agent when both fail to receive telemetry requests'() {
     Request request
 
     when: