diff --git a/htrace-core/src/test/java/org/apache/htrace/TestBadClient.java b/htrace-core/src/test/java/org/apache/htrace/TestBadClient.java
index cf060d5..e13a0f8 100644
--- a/htrace-core/src/test/java/org/apache/htrace/TestBadClient.java
+++ b/htrace-core/src/test/java/org/apache/htrace/TestBadClient.java
@@ -23,12 +23,14 @@
 import org.apache.htrace.HTraceConfiguration;
 import org.apache.htrace.Span;
 import org.apache.htrace.SpanReceiver;
+import org.apache.htrace.Tracer;
 import org.apache.htrace.TraceTree.SpansByParent;
 import org.apache.htrace.TraceTree;
 import org.apache.htrace.impl.AlwaysSampler;
 import org.apache.htrace.impl.LocalFileSpanReceiver;
 import org.apache.htrace.impl.POJOSpanReceiver;
 import org.apache.htrace.impl.StandardOutSpanReceiver;
+import org.junit.After;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -57,7 +59,6 @@
     assertTrue("Expected to get exception because of improper " +
         "scope closure.", gotException);
     innerScope.close();
-    Tracer.getInstance().setCurrentSpan(null);
   }
 
   /**
@@ -147,4 +148,9 @@
     assertTrue("Expected to get exception because of incorrect startSpan.",
         gotException);
   }
+
+  @After
+  public void resetCurrentSpan() {
+    Tracer.getInstance().setCurrentSpan(null);
+  }
 }