diff --git a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/DefaultTraceManagerTests.java b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/DefaultTraceManagerTests.java
index 605a282e8..27111bda1 100644
--- a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/DefaultTraceManagerTests.java
+++ b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/DefaultTraceManagerTests.java
@@ -135,4 +135,5 @@ public class DefaultTraceManagerTests {
 			traceManager.close(cur);
 		}
 	}
+
 }
diff --git a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/TraceCallableTest.java b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/TraceCallableTest.java
new file mode 100644
index 000000000..5b913d75c
--- /dev/null
+++ b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/TraceCallableTest.java
@@ -0,0 +1,62 @@
+package org.springframework.cloud.sleuth.instrument;
+
+import static org.assertj.core.api.BDDAssertions.then;
+
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
+import org.junit.Ignore;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mockito;
+import org.mockito.runners.MockitoJUnitRunner;
+import org.springframework.cloud.sleuth.Trace;
+import org.springframework.cloud.sleuth.TraceManager;
+import org.springframework.cloud.sleuth.trace.TraceContextHolder;
+
+@RunWith(MockitoJUnitRunner.class)
+public class TraceCallableTest {
+
+	ExecutorService executor = Executors.newSingleThreadExecutor();
+	TraceManager traceManager = Mockito.mock(TraceManager.class);
+
+	@Test
+	@Ignore("Will fail because trace is not removed after callable gets executed")
+	public void should_remove_span_from_thread_local_after_finishing_work() throws Exception {
+		givenCallableGetsSubmitted(thatSetsTraceInCurrentThreadLocalWithInitialTrace());
+
+		Trace secondTrace = whenCallableGetsSubmitted(thatRetrievesTraceFromThreadLocal());
+
+		then(secondTrace).isNull();
+	}
+
+	private Callable<Trace> thatSetsTraceInCurrentThreadLocalWithInitialTrace() {
+		return new Callable<Trace>() {
+			@Override
+			public Trace call() throws Exception {
+				TraceContextHolder.setCurrentTrace(Mockito.mock(Trace.class));
+				return TraceContextHolder.getCurrentTrace();
+			}
+		};
+	}
+
+	private Callable<Trace> thatRetrievesTraceFromThreadLocal() {
+		return new Callable<Trace>() {
+			@Override
+			public Trace call() throws Exception {
+				return TraceContextHolder.getCurrentTrace();
+			}
+		};
+	}
+
+	private Trace givenCallableGetsSubmitted(Callable<Trace> callable) throws InterruptedException, java.util.concurrent.ExecutionException {
+		return whenCallableGetsSubmitted(callable);
+	}
+
+	private Trace whenCallableGetsSubmitted(Callable<Trace> callable) throws InterruptedException, java.util.concurrent.ExecutionException {
+		return executor.submit(new TraceCallable<>(traceManager, callable)).get();
+	}
+
+
+}
\ No newline at end of file
diff --git a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/TraceRunnableTest.java b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/TraceRunnableTest.java
new file mode 100644
index 000000000..2bef46126
--- /dev/null
+++ b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/TraceRunnableTest.java
@@ -0,0 +1,73 @@
+package org.springframework.cloud.sleuth.instrument;
+
+import static org.assertj.core.api.BDDAssertions.then;
+
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
+import org.junit.Ignore;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mockito;
+import org.mockito.runners.MockitoJUnitRunner;
+import org.springframework.cloud.sleuth.Trace;
+import org.springframework.cloud.sleuth.TraceManager;
+import org.springframework.cloud.sleuth.trace.TraceContextHolder;
+
+@RunWith(MockitoJUnitRunner.class)
+public class TraceRunnableTest {
+
+	ExecutorService executor = Executors.newSingleThreadExecutor();
+	TraceManager traceManager = Mockito.mock(TraceManager.class);
+
+	@Test
+	@Ignore("Will fail because trace is not removed after runnable gets executed")
+	public void should_remove_span_from_thread_local_after_finishing_work() throws Exception {
+		// given
+		TraceSettingRunnable traceSettingRunnable = runnableThatSetsTraceInCurrentThreadLocalWithInitialTrace();
+		givenRunnableGetsSubmitted(traceSettingRunnable);
+		then(traceSettingRunnable.trace).isNotNull();
+
+		// when
+		TraceKeepingRunnable traceKeepingRunnable = runnableThatRetrievesTraceFromThreadLocal();
+		whenRunnableGetsSubmitted(traceKeepingRunnable);
+
+		// then
+		then(traceKeepingRunnable.trace).isNull();
+	}
+
+	private TraceSettingRunnable runnableThatSetsTraceInCurrentThreadLocalWithInitialTrace() {
+		return new TraceSettingRunnable();
+	}
+
+	private TraceKeepingRunnable runnableThatRetrievesTraceFromThreadLocal() {
+		return new TraceKeepingRunnable();
+	}
+
+	private void givenRunnableGetsSubmitted(Runnable runnable) throws Exception {
+		whenRunnableGetsSubmitted(runnable);
+	}
+
+	private void whenRunnableGetsSubmitted(Runnable callable) throws Exception {
+		executor.submit(new TraceRunnable(traceManager, callable)).get();
+	}
+
+	static class TraceKeepingRunnable implements Runnable {
+		public Trace trace;
+
+		@Override
+		public void run() {
+			trace = TraceContextHolder.getCurrentTrace();
+		}
+	}
+
+	static class TraceSettingRunnable implements Runnable {
+		public Trace trace;
+
+		@Override
+		public void run() {
+			TraceContextHolder.setCurrentTrace(Mockito.mock(Trace.class));
+			trace = TraceContextHolder.getCurrentTrace();
+		}
+	}
+}
\ No newline at end of file