diff --git a/dd-java-agent-ittests/dd-java-agent-ittests.gradle b/dd-java-agent-ittests/dd-java-agent-ittests.gradle
index e88fa566c2..746b6a99bc 100644
--- a/dd-java-agent-ittests/dd-java-agent-ittests.gradle
+++ b/dd-java-agent-ittests/dd-java-agent-ittests.gradle
@@ -63,7 +63,7 @@ test {
 }
 
 task expensiveTest(type: Test) {
-  jvmArgs "-Ddd.trace.configurationFile=${project.buildDir}/resources/test/dd-trace.yaml"
+  jvmArgs "-Ddd.writer.type=ListWriter", "-Ddd.service.name=java-app"
   jvmArgs "-Ddd.slf4j.simpleLogger.defaultLogLevel=debug"
   jvmArgs "-Dorg.slf4j.simpleLogger.defaultLogLevel=debug"
 
diff --git a/dd-trace/src/test/java/com/datadoghq/trace/resolver/DDTracerFactoryTest.java b/dd-trace/src/test/java/com/datadoghq/trace/resolver/DDTracerFactoryTest.java
deleted file mode 100644
index 3421318343..0000000000
--- a/dd-trace/src/test/java/com/datadoghq/trace/resolver/DDTracerFactoryTest.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package com.datadoghq.trace.resolver;
-
-import static org.assertj.core.api.Java6Assertions.assertThat;
-
-import com.datadoghq.trace.sampling.AllSampler;
-import com.datadoghq.trace.sampling.RateSampler;
-import com.datadoghq.trace.writer.DDAgentWriter;
-import org.junit.Test;
-
-public class DDTracerFactoryTest {
-
-  @Test
-  public void testDefaults() throws Exception {
-    final TracerConfig tracerConfig =
-        FactoryUtils.loadConfigFromResource("dd-trace-default", TracerConfig.class);
-
-    assertThat(tracerConfig.getWriter()).isNotNull();
-    assertThat(tracerConfig.getSampler()).isNotNull();
-    assertThat(tracerConfig.getDefaultServiceName()).isEqualTo("java-app-default");
-    assertThat(tracerConfig.getWriter().getHost()).isEqualTo("localhost");
-    assertThat(tracerConfig.getWriter().getPort()).isEqualTo(8126);
-    assertThat(tracerConfig.getWriter().getType()).isEqualTo(DDAgentWriter.class.getSimpleName());
-    assertThat(tracerConfig.getSampler().getType()).isEqualTo(AllSampler.class.getSimpleName());
-    assertThat(tracerConfig.getSampler().getRate()).isNull();
-  }
-
-  @Test
-  public void test() throws Exception {
-    TracerConfig tracerConfig =
-        FactoryUtils.loadConfigFromResource("dd-trace-1", TracerConfig.class);
-
-    assertThat(tracerConfig.getWriter()).isNotNull();
-    assertThat(tracerConfig.getSampler()).isNotNull();
-    assertThat(tracerConfig.getDefaultServiceName()).isEqualTo("java-app");
-    assertThat(tracerConfig.getWriter().getHost()).isEqualTo("foo");
-    assertThat(tracerConfig.getWriter().getPort()).isEqualTo(123);
-    assertThat(tracerConfig.getWriter().getType()).isEqualTo(DDAgentWriter.class.getSimpleName());
-    assertThat(tracerConfig.getSampler().getType()).isEqualTo(AllSampler.class.getSimpleName());
-    assertThat(tracerConfig.getSampler().getRate()).isNull();
-
-    tracerConfig = FactoryUtils.loadConfigFromResource("dd-trace-2", TracerConfig.class);
-    assertThat(tracerConfig.getWriter()).isNotNull();
-    assertThat(tracerConfig.getDefaultServiceName()).isEqualTo("java-app");
-    assertThat(tracerConfig.getWriter().getHost("localhost")).isEqualTo("localhost");
-    assertThat(tracerConfig.getWriter().getPort(8126)).isEqualTo(8126);
-    assertThat(tracerConfig.getWriter().getType()).isEqualTo(DDAgentWriter.class.getSimpleName());
-    assertThat(tracerConfig.getSampler().getType()).isEqualTo(RateSampler.class.getSimpleName());
-    assertThat(tracerConfig.getSampler().getRate()).isEqualTo(0.4);
-  }
-}