diff --git a/core/src/test/scala/org/apache/spark/JobCancellationSuite.scala b/core/src/test/scala/org/apache/spark/JobCancellationSuite.scala
index 35d88e4b7249f5baa856ea75f62b2765ee09ddb9..eca309cf29251a82b4c9e181de6f8b2afc745a19 100644
--- a/core/src/test/scala/org/apache/spark/JobCancellationSuite.scala
+++ b/core/src/test/scala/org/apache/spark/JobCancellationSuite.scala
@@ -39,6 +39,7 @@ class JobCancellationSuite extends FunSuite with ShouldMatchers with BeforeAndAf
   with LocalSparkContext {
 
   override def afterEach() {
+    super.afterEach()
     System.clearProperty("spark.scheduler.mode")
   }
 
diff --git a/core/src/test/scala/org/apache/spark/scheduler/local/LocalSchedulerSuite.scala b/core/src/test/scala/org/apache/spark/scheduler/local/LocalSchedulerSuite.scala
index d46a7469c7075ed74efd765ac2cdb1c974de77a7..1e676c1719337179e02940472632baeb7966b63a 100644
--- a/core/src/test/scala/org/apache/spark/scheduler/local/LocalSchedulerSuite.scala
+++ b/core/src/test/scala/org/apache/spark/scheduler/local/LocalSchedulerSuite.scala
@@ -64,6 +64,7 @@ object TaskThreadInfo {
 class LocalSchedulerSuite extends FunSuite with LocalSparkContext with BeforeAndAfterEach {
 
   override def afterEach() {
+    super.afterEach()
     System.clearProperty("spark.scheduler.mode")
   }
 
@@ -150,12 +151,13 @@ class LocalSchedulerSuite extends FunSuite with LocalSparkContext with BeforeAnd
   }
 
   test("Local fair scheduler end-to-end test") {
-    sc = new SparkContext("local[8]", "LocalSchedulerSuite")
-    val sem = new Semaphore(0)
     System.setProperty("spark.scheduler.mode", "FAIR")
     val xmlPath = getClass.getClassLoader.getResource("fairscheduler.xml").getFile()
     System.setProperty("spark.scheduler.allocation.file", xmlPath)
 
+    sc = new SparkContext("local[8]", "LocalSchedulerSuite")
+    val sem = new Semaphore(0)
+
     createThread(10,"1",sc,sem)
     TaskThreadInfo.threadToStarted(10).await()
     createThread(20,"2",sc,sem)