diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/AgentInstaller.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/AgentInstaller.java
index 41915f7479..645efa9720 100644
--- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/AgentInstaller.java
+++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/AgentInstaller.java
@@ -48,7 +48,7 @@ public class AgentInstaller {
             .or(nameStartsWith("datadog.opentracing."))
             .or(nameStartsWith("datadog.slf4j."))
             .or(nameStartsWith("java.").and(not(nameStartsWith("java.util.concurrent."))))
-            .or(nameStartsWith("com.sun.").and(not(nameStartsWith("com.sun.proxy."))))
+            .or(nameStartsWith("com.sun."))
             .or(nameStartsWith("sun."))
             .or(nameStartsWith("jdk."))
             .or(nameStartsWith("org.aspectj."))
diff --git a/dd-java-agent/instrumentation/jms-1/src/test/groovy/JMS1Test.groovy b/dd-java-agent/instrumentation/jms-1/src/test/groovy/JMS1Test.groovy
index 0467557fa3..9156517897 100644
--- a/dd-java-agent/instrumentation/jms-1/src/test/groovy/JMS1Test.groovy
+++ b/dd-java-agent/instrumentation/jms-1/src/test/groovy/JMS1Test.groovy
@@ -8,6 +8,8 @@ import spock.lang.Shared
 import spock.lang.Unroll
 
 import javax.jms.Connection
+import javax.jms.Message
+import javax.jms.MessageListener
 import javax.jms.Session
 import javax.jms.TextMessage
 import java.util.concurrent.CountDownLatch
@@ -152,9 +154,12 @@ class JMS1Test extends AgentTestRunner {
     def messageRef = new AtomicReference<TextMessage>()
     def producer = session.createProducer(destination)
     def consumer = session.createConsumer(destination)
-    consumer.setMessageListener { message ->
-      lock.await() // ensure the producer trace is reported first.
-      messageRef.set(message)
+    consumer.setMessageListener new MessageListener() {
+      @Override
+      void onMessage(Message message) {
+        lock.await() // ensure the producer trace is reported first.
+        messageRef.set(message)
+      }
     }
 
     def message = session.createTextMessage("a message")
diff --git a/dd-java-agent/instrumentation/jms-2/src/test/groovy/JMS2Test.groovy b/dd-java-agent/instrumentation/jms-2/src/test/groovy/JMS2Test.groovy
index 795a22f599..8a3f2b0500 100644
--- a/dd-java-agent/instrumentation/jms-2/src/test/groovy/JMS2Test.groovy
+++ b/dd-java-agent/instrumentation/jms-2/src/test/groovy/JMS2Test.groovy
@@ -17,6 +17,8 @@ import org.hornetq.jms.client.HornetQMessageProducer
 import spock.lang.Shared
 import spock.lang.Unroll
 
+import javax.jms.Message
+import javax.jms.MessageListener
 import javax.jms.Session
 import javax.jms.TextMessage
 import java.util.concurrent.CountDownLatch
@@ -143,9 +145,12 @@ class JMS2Test extends AgentTestRunner {
     def messageRef = new AtomicReference<TextMessage>()
     def producer = session.createProducer(destination)
     def consumer = session.createConsumer(destination)
-    consumer.setMessageListener { message ->
-      lock.await() // ensure the producer trace is reported first.
-      messageRef.set(message)
+    consumer.setMessageListener new MessageListener() {
+      @Override
+      void onMessage(Message message) {
+        lock.await() // ensure the producer trace is reported first.
+        messageRef.set(message)
+      }
     }
 
     def message = session.createTextMessage("a message")