diff --git a/quickfixj-core/src/test/java/quickfix/FileLogTest.java b/quickfixj-core/src/test/java/quickfix/FileLogTest.java
index cf524424c0..15dd38d6c5 100644
--- a/quickfixj-core/src/test/java/quickfix/FileLogTest.java
+++ b/quickfixj-core/src/test/java/quickfix/FileLogTest.java
@@ -25,6 +25,7 @@
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.util.Date;
+import org.junit.After;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -39,6 +40,11 @@ public void setUp() throws Exception {
         SystemTime.setTimeSource(new MockSystemTimeSource(System.currentTimeMillis()));
     }
 
+    @After
+    public void tearDown() throws Exception {
+        SystemTime.setTimeSource(null);
+    }
+
     @Test
     public void testLog() throws Exception {
         long systemTime = System.currentTimeMillis();
diff --git a/quickfixj-core/src/test/java/quickfix/LogUtilTest.java b/quickfixj-core/src/test/java/quickfix/LogUtilTest.java
index 46c4168d28..f533c7c042 100644
--- a/quickfixj-core/src/test/java/quickfix/LogUtilTest.java
+++ b/quickfixj-core/src/test/java/quickfix/LogUtilTest.java
@@ -19,20 +19,28 @@
 
 package quickfix;
 
-import junit.framework.TestCase;
-
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.PrintStream;
 import java.util.Date;
+import org.junit.After;
+import static org.junit.Assert.assertTrue;
+import org.junit.Before;
+import org.junit.Test;
 
-public class LogUtilTest extends TestCase {
+public class LogUtilTest {
 
-    protected void setUp() throws Exception {
-        super.setUp();
+    @Before
+    public void setUp() throws Exception {
         SystemTime.setTimeSource(new MockSystemTimeSource(System.currentTimeMillis()));
     }
 
+    @After
+    public void tearDown() throws Exception {
+        SystemTime.setTimeSource(null);
+    }
+    
+    @Test
     public void testLogThrowable() throws ConfigError, FieldConvertError {
         ByteArrayOutputStream data = new ByteArrayOutputStream();
         LogFactory mockLogFactory = createLogFactory(data);
diff --git a/quickfixj-core/src/test/java/quickfix/test/acceptance/AcceptanceTestSuite.java b/quickfixj-core/src/test/java/quickfix/test/acceptance/AcceptanceTestSuite.java
index 6bcbd1e01f..77f620dee5 100644
--- a/quickfixj-core/src/test/java/quickfix/test/acceptance/AcceptanceTestSuite.java
+++ b/quickfixj-core/src/test/java/quickfix/test/acceptance/AcceptanceTestSuite.java
@@ -27,6 +27,7 @@
 import java.util.Map;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
+import quickfix.SystemTime;
 
 public class AcceptanceTestSuite extends TestSuite {
     private static final String ATEST_TIMEOUT_KEY = "atest.timeout";
@@ -153,6 +154,8 @@ public AcceptanceTestSuite(String testDirectory, boolean multithreaded) {
     public AcceptanceTestSuite(String testDirectory, boolean multithreaded, Map<Object, Object> overridenProperties) {
         this.multithreaded = multithreaded;
         this.overridenProperties = overridenProperties;
+        SystemTime.setTimeSource(null);
+
         String name = testDirectory.substring(testDirectory.lastIndexOf(File.separatorChar) + 1);
         this.setName(name + (multithreaded ? "-threaded" : ""));
         Long timeout = Long.getLong(ATEST_TIMEOUT_KEY);