diff --git a/.circleci/config.yml b/.circleci/config.yml
index 08bd7a925e..9df4649336 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -14,7 +14,7 @@ jobs:
 
       - run:
           name: Run Tests
-          command: ./gradlew clean shadowJar check --parallel
+          command: ./gradlew clean check --parallel
 
       - save_cache:
           paths:
diff --git a/dd-java-agent-ittests/dd-java-agent-ittests.gradle b/dd-java-agent-ittests/dd-java-agent-ittests.gradle
index b1913cf1e8..55742124b4 100644
--- a/dd-java-agent-ittests/dd-java-agent-ittests.gradle
+++ b/dd-java-agent-ittests/dd-java-agent-ittests.gradle
@@ -37,7 +37,7 @@ dependencies {
 
 test {
   jvmArgs "-Ddd.trace.configurationFile=${project.buildDir}/resources/test/dd-trace.yaml"
-  jvmArgs "-javaagent:${project(':dd-java-agent').buildDir}/libs/dd-java-agent-${project.version}-shadow.jar"
+  jvmArgs "-javaagent:${project(':dd-java-agent').buildDir}/libs/dd-java-agent-${project.version}.jar"
   jvmArgs "-Dorg.jboss.byteman.verbose=true"
 }
 
diff --git a/dd-java-agent/dd-java-agent.gradle b/dd-java-agent/dd-java-agent.gradle
index f321a7fb85..96ce4d149c 100644
--- a/dd-java-agent/dd-java-agent.gradle
+++ b/dd-java-agent/dd-java-agent.gradle
@@ -71,6 +71,8 @@ dependencies {
 }
 
 jar {
+  classifier = 'unbundled'
+
   manifest {
     attributes(
       // I don't think we want to define this since we can't really load after startup:
@@ -88,16 +90,15 @@ jar {
 shadowJar {
   append 'otarules.btm'
 
-  classifier 'shadow'
+  classifier null
 
 //    mergeServiceFiles()
 
   // Various tests fail when these are uncommented:
-//    relocate 'ch.qos.logback', 'dd.deps.ch.qos.logback'
 //    relocate 'com.google', 'dd.deps.com.google'
 //    relocate 'org.jboss.byteman', 'dd.deps.org.jboss.byteman'
-//    relocate 'org.slf4j', 'dd.deps.org.slf4j'
 
+  // Don't relocate slf4j or opentracing deps.
   relocate 'com.fasterxml', 'dd.deps.com.fasterxml'
   relocate 'javassist', 'dd.deps.javassist'
   relocate 'org.reflections', 'dd.deps.org.reflections'
diff --git a/dd-trace/dd-trace.gradle b/dd-trace/dd-trace.gradle
index 272535fa88..7844a0af5a 100644
--- a/dd-trace/dd-trace.gradle
+++ b/dd-trace/dd-trace.gradle
@@ -36,11 +36,16 @@ dependencies {
   jmh 'commons-io:commons-io:2.4'
 }
 
+jar {
+  classifier = 'unbundled'
+}
+
 shadowJar {
 //    mergeServiceFiles()
 
-  classifier 'shadow'
+  classifier null
 
+  // Don't relocate slf4j or opentracing deps.
   relocate 'com.fasterxml', 'dd.deps.com.fasterxml'
   relocate 'com.google', 'dd.deps.com.google'
   relocate 'javassist', 'dd.deps.javassist'
diff --git a/gradle/java.gradle b/gradle/java.gradle
index c18ed561cb..351ff4a36c 100644
--- a/gradle/java.gradle
+++ b/gradle/java.gradle
@@ -25,7 +25,6 @@ tasks.withType(Javadoc) {
   options.encoding = "utf-8"
   options.docEncoding = "utf-8"
   options.charSet = "utf-8"
-  exclude "**/internal/**"
 
   options.addStringOption('Xdoclint:none', '-quiet')
 
@@ -59,10 +58,19 @@ task javaDocJar(type: Jar, dependsOn: javadoc) {
 }
 
 artifacts {
-  archives jar
   archives sourceJar
   archives javaDocJar
 }
 
+if (project.plugins.hasPlugin('com.github.johnrengelman.shadow')) {
+  // Remove the no-deps jar from the archives to prevent publication
+  configurations.archives.with {
+    artifacts.remove artifacts.find { it.archiveTask.is jar }
+  }
+  artifacts {
+    archives shadowJar
+  }
+}
+
 apply from: "$rootDir/gradle/checkstyle.gradle"
 apply from: "$rootDir/gradle/codenarc.gradle"
diff --git a/gradle/util.gradle b/gradle/util.gradle
new file mode 100644
index 0000000000..8406b26534
--- /dev/null
+++ b/gradle/util.gradle
@@ -0,0 +1,13 @@
+task artifacts {
+  group = "Help"
+  description = "Displays the artifacts associated with each configuration of " + project
+  doFirst {
+    configurations.findAll().each { config ->
+      println "${config}:"
+      config.allArtifacts.getFiles().each { file ->
+        println " " + file
+      }
+      println ' '
+    }
+  }
+}