diff --git a/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/context/ContextCarrierTest.java b/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/context/ContextCarrierTestCase.java
similarity index 97%
rename from skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/context/ContextCarrierTest.java
rename to skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/context/ContextCarrierTestCase.java
index 86b867ad3..82660a7a1 100644
--- a/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/context/ContextCarrierTest.java
+++ b/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/context/ContextCarrierTestCase.java
@@ -6,7 +6,7 @@ import org.junit.Test;
 /**
  * Created by wusheng on 2017/2/19.
  */
-public class ContextCarrierTest {
+public class ContextCarrierTestCase {
     @Test
     public void testSerialize(){
         ContextCarrier carrier = new ContextCarrier();
diff --git a/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/context/ContextManagerTestCase.java b/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/context/ContextManagerTestCase.java
new file mode 100644
index 000000000..80ee01c42
--- /dev/null
+++ b/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/context/ContextManagerTestCase.java
@@ -0,0 +1,27 @@
+package com.a.eye.skywalking.context;
+
+import com.a.eye.skywalking.trace.Span;
+import com.a.eye.skywalking.trace.TraceSegment;
+import com.a.eye.skywalking.trace.tag.Tags;
+import org.junit.Assert;
+import org.junit.Test;
+
+/**
+ * Created by wusheng on 2017/2/19.
+ */
+public class ContextManagerTestCase {
+    @Test
+    public void testDelegateToTracerContext(){
+        Span span = ContextManager.INSTANCE.createSpan("serviceA");
+        Tags.COMPONENT.set(span, "test");
+
+        Assert.assertEquals(span, ContextManager.INSTANCE.activeSpan());
+
+        TracerContext.ListenerManager.add(TestTracerContextListener.INSTANCE);
+        ContextManager.INSTANCE.stopSpan();
+
+        TraceSegment segment = TestTracerContextListener.INSTANCE.finishedSegmentCarrier[0];
+
+        Assert.assertEquals(span, segment.getSpans().get(0));
+    }
+}
diff --git a/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/context/TestTracerContextListener.java b/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/context/TestTracerContextListener.java
new file mode 100644
index 000000000..2b6c56eb0
--- /dev/null
+++ b/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/context/TestTracerContextListener.java
@@ -0,0 +1,15 @@
+package com.a.eye.skywalking.context;
+
+import com.a.eye.skywalking.trace.TraceSegment;
+
+/**
+ * Created by wusheng on 2017/2/19.
+ */
+public enum TestTracerContextListener implements TracerContextListener {
+    INSTANCE;
+    final TraceSegment[] finishedSegmentCarrier = {null};
+
+    @Override public void afterFinished(TraceSegment traceSegment) {
+        finishedSegmentCarrier[0] = traceSegment;
+    }
+}
diff --git a/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/context/TracerContextTest.java b/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/context/TracerContextTestCase.java
similarity index 90%
rename from skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/context/TracerContextTest.java
rename to skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/context/TracerContextTestCase.java
index 768d9be35..845251ad2 100644
--- a/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/context/TracerContextTest.java
+++ b/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/context/TracerContextTestCase.java
@@ -9,7 +9,7 @@ import org.junit.Test;
 /**
  * Created by wusheng on 2017/2/19.
  */
-public class TracerContextTest {
+public class TracerContextTestCase {
     @Test
     public void testSpanLifeCycle(){
         TracerContext context = new TracerContext();
@@ -89,13 +89,4 @@ public class TracerContextTest {
     public void reset(){
         TracerContext.ListenerManager.remove(TestTracerContextListener.INSTANCE);
     }
-
-    public enum TestTracerContextListener implements TracerContextListener {
-        INSTANCE;
-        final TraceSegment[] finishedSegmentCarrier = {null};
-
-        @Override public void afterFinished(TraceSegment traceSegment) {
-            finishedSegmentCarrier[0] = traceSegment;
-        }
-    }
 }