diff --git a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/ConnectionInstrumentation.java b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/ConnectionInstrumentation.java
index 9c383c2052..77225219ad 100644
--- a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/ConnectionInstrumentation.java
+++ b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/ConnectionInstrumentation.java
@@ -43,7 +43,7 @@ public final class ConnectionInstrumentation extends Instrumenter.Default {
         nameStartsWith("prepare")
             .and(takesArgument(0, String.class))
             // Also include CallableStatement, which is a sub type of PreparedStatement
-            .and(returns(safeHasSuperType(named(PreparedStatement.class.getName())))),
+            .and(returns(safeHasSuperType(named("java.sql.PreparedStatement")))),
         ConnectionPrepareAdvice.class.getName());
   }
 
diff --git a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/DriverInstrumentation.java b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/DriverInstrumentation.java
index a5340ddbd3..3fd216aa94 100644
--- a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/DriverInstrumentation.java
+++ b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/DriverInstrumentation.java
@@ -54,7 +54,7 @@ public final class DriverInstrumentation extends Instrumenter.Default {
         nameStartsWith("connect")
             .and(takesArgument(0, String.class))
             .and(takesArgument(1, Properties.class))
-            .and(returns(Connection.class)),
+            .and(returns(named("java.sql.Connection"))),
         DriverAdvice.class.getName());
   }