diff --git a/tests/test_entropy/test_entropy.py b/tests/test_entropy/test_entropy.py
index 4657101ad6..9b13fd3dd2 100644
--- a/tests/test_entropy/test_entropy.py
+++ b/tests/test_entropy/test_entropy.py
@@ -1,6 +1,9 @@
 #!/usr/bin/env python
 
+import glob
+import os
 import sys
+
 sys.path.insert(0, '..')
 from testing_harness import *
 
diff --git a/tests/test_filter_distribcell/test_filter_distribcell.py b/tests/test_filter_distribcell/test_filter_distribcell.py
index 8370e40e7f..541d6b6af1 100644
--- a/tests/test_filter_distribcell/test_filter_distribcell.py
+++ b/tests/test_filter_distribcell/test_filter_distribcell.py
@@ -1,6 +1,8 @@
 #!/usr/bin/env python
 
+import glob
 import hashlib
+import os
 import sys
 
 sys.path.insert(0, '..')
diff --git a/tests/test_fixed_source/test_fixed_source.py b/tests/test_fixed_source/test_fixed_source.py
index e96a3ad8fe..1f154a4657 100644
--- a/tests/test_fixed_source/test_fixed_source.py
+++ b/tests/test_fixed_source/test_fixed_source.py
@@ -1,6 +1,9 @@
 #!/usr/bin/env python
 
+import glob
+import os
 import sys
+
 sys.path.insert(0, '..')
 from testing_harness import *
 
diff --git a/tests/test_output/test_output.py b/tests/test_output/test_output.py
index 0225d9fed0..b37b7d07b2 100644
--- a/tests/test_output/test_output.py
+++ b/tests/test_output/test_output.py
@@ -1,6 +1,9 @@
 #!/usr/bin/env python
 
+import glob
+import os
 import sys
+
 sys.path.insert(0, '..')
 from testing_harness import *
 
diff --git a/tests/test_source_file/test_source_file.py b/tests/test_source_file/test_source_file.py
index d7ed8b80af..fae6b2a72f 100644
--- a/tests/test_source_file/test_source_file.py
+++ b/tests/test_source_file/test_source_file.py
@@ -1,6 +1,9 @@
 #!/usr/bin/env python
 
+import glob
+import os
 import sys
+
 sys.path.insert(0, '..')
 from testing_harness import *
 
diff --git a/tests/test_sourcepoint_batch/test_sourcepoint_batch.py b/tests/test_sourcepoint_batch/test_sourcepoint_batch.py
index a902236599..521e3bb4b2 100644
--- a/tests/test_sourcepoint_batch/test_sourcepoint_batch.py
+++ b/tests/test_sourcepoint_batch/test_sourcepoint_batch.py
@@ -1,6 +1,9 @@
 #!/usr/bin/env python
 
+import glob
+import os
 import sys
+
 sys.path.insert(0, '..')
 from testing_harness import *
 
diff --git a/tests/test_sourcepoint_interval/test_sourcepoint_interval.py b/tests/test_sourcepoint_interval/test_sourcepoint_interval.py
index a902236599..521e3bb4b2 100644
--- a/tests/test_sourcepoint_interval/test_sourcepoint_interval.py
+++ b/tests/test_sourcepoint_interval/test_sourcepoint_interval.py
@@ -1,6 +1,9 @@
 #!/usr/bin/env python
 
+import glob
+import os
 import sys
+
 sys.path.insert(0, '..')
 from testing_harness import *
 
diff --git a/tests/test_sourcepoint_latest/test_sourcepoint_latest.py b/tests/test_sourcepoint_latest/test_sourcepoint_latest.py
index 8c04641b7b..7d0af89b97 100644
--- a/tests/test_sourcepoint_latest/test_sourcepoint_latest.py
+++ b/tests/test_sourcepoint_latest/test_sourcepoint_latest.py
@@ -1,6 +1,9 @@
 #!/usr/bin/env python
 
+import glob
+import os
 import sys
+
 sys.path.insert(0, '..')
 from testing_harness import *
 
diff --git a/tests/test_statepoint_restart/test_statepoint_restart.py b/tests/test_statepoint_restart/test_statepoint_restart.py
index 0420dbddfa..dd42dc8ff5 100644
--- a/tests/test_statepoint_restart/test_statepoint_restart.py
+++ b/tests/test_statepoint_restart/test_statepoint_restart.py
@@ -1,6 +1,9 @@
 #!/usr/bin/env python
 
+import glob
+import os
 import sys
+
 sys.path.insert(0, '..')
 from testing_harness import *
 
diff --git a/tests/test_statepoint_sourcesep/test_statepoint_sourcesep.py b/tests/test_statepoint_sourcesep/test_statepoint_sourcesep.py
index acbb0180bf..c7221c90c2 100644
--- a/tests/test_statepoint_sourcesep/test_statepoint_sourcesep.py
+++ b/tests/test_statepoint_sourcesep/test_statepoint_sourcesep.py
@@ -1,6 +1,9 @@
 #!/usr/bin/env python
 
+import glob
+import os
 import sys
+
 sys.path.insert(0, '..')
 from testing_harness import *
 
@@ -15,6 +18,13 @@ class SourcepointTestHarness(TestHarness):
         assert source[0].endswith('h5'), \
              'Source file is not a HDF5 file.'
 
+    def _cleanup(self):
+        TestHarness._cleanup(self)
+        output = glob.glob(os.path.join(os.getcwd(), 'source.*'))
+        for f in output:
+            if os.path.exists(f):
+                os.remove(f)
+
 
 if __name__ == '__main__':
     harness = SourcepointTestHarness('statepoint.10.*')
diff --git a/tests/test_track_output/test_track_output.py b/tests/test_track_output/test_track_output.py
index 1192d1b3a3..dc0eb1a69d 100644
--- a/tests/test_track_output/test_track_output.py
+++ b/tests/test_track_output/test_track_output.py
@@ -1,5 +1,7 @@
 #!/usr/bin/env python
 
+import glob
+import os
 import shutil
 import sys