diff --git a/Code/Mantid/MantidPlot/CMakeLists.txt b/Code/Mantid/MantidPlot/CMakeLists.txt
index fdcc833a46760985fdc8b565cb02fd5a37536e84..d3e6a60ac3a4db20051a8615999e6af5852c5c06 100644
--- a/Code/Mantid/MantidPlot/CMakeLists.txt
+++ b/Code/Mantid/MantidPlot/CMakeLists.txt
@@ -828,11 +828,11 @@ add_custom_command ( TARGET MantidPlot POST_BUILD
 
 # List of .py files than must be run WITHIN MantidPlot.
 set ( MANTIDPLOT_TEST_PY_FILES 
-	#MantidPlotSliceViewerTest.py #FIXME: Only works with old-style python API as of Jan 10, 2012
+	MantidPlotSliceViewerTest.py 
 	MantidPlot1DPlotTest.py
 	MantidPlotProxiesTest.py
 	MantidPlotPythonImportTest.py
-	#MantidPlotFoldersTest.py #FIXME: Only works with old-style python API as of Jan 10, 2012
+	MantidPlotFoldersTest.py 
 )
 
 if ( 0 )
diff --git a/Code/Mantid/MantidPlot/test/MantidPlotFoldersTest.py b/Code/Mantid/MantidPlot/test/MantidPlotFoldersTest.py
index 59cd34220f39f8900028237a3d1a94188eb3b792..8411c5c31b8bac443a3062d59bb54effc08e9527 100644
--- a/Code/Mantid/MantidPlot/test/MantidPlotFoldersTest.py
+++ b/Code/Mantid/MantidPlot/test/MantidPlotFoldersTest.py
@@ -4,9 +4,6 @@ folders.
 """
 import mantidplottests
 from mantidplottests import *
-import time
-import numpy as np
-from PyQt4 import QtGui, QtCore
 
 class MantidPlotFoldersTest(unittest.TestCase):
     
diff --git a/Code/Mantid/MantidPlot/test/MantidPlotSliceViewerTest.py b/Code/Mantid/MantidPlot/test/MantidPlotSliceViewerTest.py
index 4ff9b31a00512c3e06b67a36fe07a69904466fad..eaa3a5193024b731e2e44cc65cc1fe7f9fd5ee0b 100644
--- a/Code/Mantid/MantidPlot/test/MantidPlotSliceViewerTest.py
+++ b/Code/Mantid/MantidPlot/test/MantidPlotSliceViewerTest.py
@@ -13,17 +13,12 @@ import mantidplottests
 from mantidplottests import *
 import time
 
-good_setup = False
-try: 
-    CreateMDWorkspace(Dimensions='3',Extents='0,10,0,10,0,10',Names='x,y,z',Units='m,m,m',SplitInto='5',MaxRecursionDepth='20',OutputWorkspace='mdw')
-    FakeMDEventData(InputWorkspace="mdw",  UniformParams="1e5")
-    FakeMDEventData(InputWorkspace="mdw",  PeakParams="1e4, 2,4,6, 1.5")
-    BinMD(InputWorkspace="mdw", OutputWorkspace="uniform",  AxisAligned=1, AlignedDimX="x,0,10,30", AlignedDimY="y,0,10,30", AlignedDimZ="z,0,10,30", IterateEvents="1", Parallel="0")
-    CreateMDWorkspace(Dimensions='3',Extents='0,10,0,10,0,10',Names='x,y,z',Units='m,m,m',SplitInto='5',MaxRecursionDepth='20',OutputWorkspace='empty')
-    CreateMDWorkspace(Dimensions='4',Extents='0,10,0,10,0,10,0,10',Names='x,y,z,e',Units='m,m,m,meV',SplitInto='5',MaxRecursionDepth='20',OutputWorkspace='md4')
-    good_setup = True
-except:
-    pass
+CreateMDWorkspace(Dimensions='3',Extents='0,10,0,10,0,10',Names='x,y,z',Units='m,m,m',SplitInto='5',MaxRecursionDepth='20',OutputWorkspace='mdw')
+FakeMDEventData(InputWorkspace="mdw",  UniformParams="1e5")
+FakeMDEventData(InputWorkspace="mdw",  PeakParams="1e4, 2,4,6, 1.5")
+BinMD(InputWorkspace="mdw", OutputWorkspace="uniform",  AxisAligned=True, AlignedDimX="x,0,10,30", AlignedDimY="y,0,10,30", AlignedDimZ="z,0,10,30", IterateEvents="1", Parallel="0")
+CreateMDWorkspace(Dimensions='3',Extents='0,10,0,10,0,10',Names='x,y,z',Units='m,m,m',SplitInto='5',MaxRecursionDepth='20',OutputWorkspace='empty')
+CreateMDWorkspace(Dimensions='4',Extents='0,10,0,10,0,10,0,10',Names='x,y,z,e',Units='m,m,m,meV',SplitInto='5',MaxRecursionDepth='20',OutputWorkspace='md4')
 
 class MantidPlotSliceViewerTest(unittest.TestCase):
     
@@ -34,10 +29,6 @@ class MantidPlotSliceViewerTest(unittest.TestCase):
         closeAllSliceViewers()
         pass
     
-    def test_good_setup(self):
-        global good_setup
-        self.assertTrue(good_setup, "Data was setup correctly")
-
     def test_plotSlice(self):
         """ Basic plotSlice() usage """
         svw = plotSlice('uniform')
diff --git a/Code/Mantid/MantidPlot/test/mantidplottests.py b/Code/Mantid/MantidPlot/test/mantidplottests.py
index 9621877dce3be811d0edaccf38ddf165b7d7e65f..86ad36c06a87d62cf947eb6c43e1b875c848bcd6 100644
--- a/Code/Mantid/MantidPlot/test/mantidplottests.py
+++ b/Code/Mantid/MantidPlot/test/mantidplottests.py
@@ -147,6 +147,11 @@ def runTests(classname):
     #Run using either runner
     res = runner.run(suite)
     
+    # Process some events that ensure MantidPlot closes properly.
+    QtCore.QCoreApplication.processEvents()
+    QtCore.QCoreApplication.processEvents()
+    QtCore.QCoreApplication.processEvents()
+    
     # Set Mantid exit code
     if not res.wasSuccessful():
         qti.app.setExitCode(1)