diff --git a/Code/Mantid/Framework/Algorithms/test/ConvertFromDistributionTest.h b/Code/Mantid/Framework/Algorithms/test/ConvertFromDistributionTest.h
index da926976f457ad16b83528a6c0c1c2abdad1fbe5..fd1a5ee4c68e47ce371704ffe3d21358823dda95 100644
--- a/Code/Mantid/Framework/Algorithms/test/ConvertFromDistributionTest.h
+++ b/Code/Mantid/Framework/Algorithms/test/ConvertFromDistributionTest.h
@@ -13,6 +13,9 @@ using Mantid::Algorithms::ConvertFromDistribution;
 class ConvertFromDistributionTest : public CxxTest::TestSuite
 {
 public:
+  static ConvertFromDistributionTest *createSuite() { return new ConvertFromDistributionTest(); }
+  static void destroySuite(ConvertFromDistributionTest *suite) { delete suite; }
+
   ConvertFromDistributionTest() : dist("dist")
   {
     MatrixWorkspace_sptr WS = WorkspaceCreationHelper::Create2DWorkspaceBinned(1,10,0,0.5);
diff --git a/Code/Mantid/Framework/Algorithms/test/ConvertToDistributionTest.h b/Code/Mantid/Framework/Algorithms/test/ConvertToDistributionTest.h
index e524f3a1b1842066499a399bdb2fa465834256a2..e011309b3b00c605533bb97d7731518341ae7940 100644
--- a/Code/Mantid/Framework/Algorithms/test/ConvertToDistributionTest.h
+++ b/Code/Mantid/Framework/Algorithms/test/ConvertToDistributionTest.h
@@ -13,6 +13,9 @@ using Mantid::Algorithms::ConvertToDistribution;
 class ConvertToDistributionTest : public CxxTest::TestSuite
 {
 public:
+  static ConvertToDistributionTest *createSuite() { return new ConvertToDistributionTest(); }
+  static void destroySuite(ConvertToDistributionTest *suite) { delete suite; }
+
   ConvertToDistributionTest() : dist("notDist")
   {
     Workspace_sptr WS = WorkspaceCreationHelper::Create2DWorkspaceBinned(1,10,0,0.5);
diff --git a/Code/Mantid/Framework/Algorithms/test/CropWorkspaceTest.h b/Code/Mantid/Framework/Algorithms/test/CropWorkspaceTest.h
index 6826e4d615ce9104d88b347b832a56099d0c2b3d..7c30deccb2d33b75f4854021b53ba257ac173dbf 100644
--- a/Code/Mantid/Framework/Algorithms/test/CropWorkspaceTest.h
+++ b/Code/Mantid/Framework/Algorithms/test/CropWorkspaceTest.h
@@ -14,6 +14,9 @@ using namespace Mantid::DataObjects;
 class CropWorkspaceTest : public CxxTest::TestSuite
 {
 public:
+  static CropWorkspaceTest *createSuite() { return new CropWorkspaceTest(); }
+  static void destroySuite(CropWorkspaceTest *suite) { delete suite; }
+
   CropWorkspaceTest()
   {
     // Set up a small workspace for testing
diff --git a/Code/Mantid/Framework/Algorithms/test/FlatBackgroundTest.h b/Code/Mantid/Framework/Algorithms/test/FlatBackgroundTest.h
index a1826fa4a78b9c9cf5c83bb7418123f5eb15362a..65e5347c68cf2f15f33c06ae5fbce2bf38a9e56e 100644
--- a/Code/Mantid/Framework/Algorithms/test/FlatBackgroundTest.h
+++ b/Code/Mantid/Framework/Algorithms/test/FlatBackgroundTest.h
@@ -18,6 +18,9 @@ static const int NUMSPECS = 4;
 class FlatBackgroundTest : public CxxTest::TestSuite
 {
 public:
+  static FlatBackgroundTest *createSuite() { return new FlatBackgroundTest(); }
+  static void destroySuite(FlatBackgroundTest *suite) { delete suite; }
+
   FlatBackgroundTest()
   {
     bg = 100.0;
diff --git a/Code/Mantid/Framework/Algorithms/test/GetDetectorOffsetsTest.h b/Code/Mantid/Framework/Algorithms/test/GetDetectorOffsetsTest.h
index 684a70096afaf9fea7b6f59a3535f5d7e7c63b4e..5b7dd08d498e64b08685a7fa793edb9918bad1d8 100644
--- a/Code/Mantid/Framework/Algorithms/test/GetDetectorOffsetsTest.h
+++ b/Code/Mantid/Framework/Algorithms/test/GetDetectorOffsetsTest.h
@@ -16,6 +16,9 @@ using Mantid::Algorithms::GetDetectorOffsets;
 class GetDetectorOffsetsTest : public CxxTest::TestSuite
 {
 public:
+  static GetDetectorOffsetsTest *createSuite() { return new GetDetectorOffsetsTest(); }
+  static void destroySuite(GetDetectorOffsetsTest *suite) { delete suite; }
+
   GetDetectorOffsetsTest()
   {
     MatrixWorkspace_sptr WS = WorkspaceCreationHelper::Create2DWorkspaceBinned(1,200,-100.5,1);
diff --git a/Code/Mantid/Framework/Algorithms/test/IntegrationTest.h b/Code/Mantid/Framework/Algorithms/test/IntegrationTest.h
index 3e7cef6deb0fdde7502fadd7ccc6e6cae439bf83..f415261806838fda8dcc33745d8da1795cd14a45 100644
--- a/Code/Mantid/Framework/Algorithms/test/IntegrationTest.h
+++ b/Code/Mantid/Framework/Algorithms/test/IntegrationTest.h
@@ -19,6 +19,8 @@ using Mantid::MantidVec;
 class IntegrationTest : public CxxTest::TestSuite
 {
 public:
+  static IntegrationTest *createSuite() { return new IntegrationTest(); }
+  static void destroySuite(IntegrationTest *suite) { delete suite; }
 
   IntegrationTest()
   {
diff --git a/Code/Mantid/Framework/Algorithms/test/MergeRunsTest.h b/Code/Mantid/Framework/Algorithms/test/MergeRunsTest.h
index f8490a63ba96f3fb1d92c52bb23c9cb44bf3733d..a2af0f7b59fb2a400a492bd28ec5d0c61b3476a1 100644
--- a/Code/Mantid/Framework/Algorithms/test/MergeRunsTest.h
+++ b/Code/Mantid/Framework/Algorithms/test/MergeRunsTest.h
@@ -19,6 +19,8 @@ using Mantid::DataHandling::LoadEventPreNeXus;
 class MergeRunsTest : public CxxTest::TestSuite
 {
 public:
+  static MergeRunsTest *createSuite() { return new MergeRunsTest(); }
+  static void destroySuite(MergeRunsTest *suite) { delete suite; }
 
   EventWorkspace_sptr ev1, ev2, ev3, ev4, ev5,ev6,evg1, evg2, evg3;
 
diff --git a/Code/Mantid/Framework/Algorithms/test/NormaliseToMonitorTest.h b/Code/Mantid/Framework/Algorithms/test/NormaliseToMonitorTest.h
index 9103fc272436dcb4661cd889cdb9b8a5d1cb8b45..b900418fdf19b0cf0efd6b39ca752f0780d5d559 100644
--- a/Code/Mantid/Framework/Algorithms/test/NormaliseToMonitorTest.h
+++ b/Code/Mantid/Framework/Algorithms/test/NormaliseToMonitorTest.h
@@ -18,6 +18,10 @@ private:
   NormaliseToMonitor norm;
 
 public:
+
+  static NormaliseToMonitorTest *createSuite() { return new NormaliseToMonitorTest(); }
+  static void destroySuite(NormaliseToMonitorTest *suite) { delete suite; }
+
   NormaliseToMonitorTest()
   {
     MatrixWorkspace_sptr input = WorkspaceCreationHelper::Create2DWorkspace123(10,3,1);
diff --git a/Code/Mantid/Framework/Algorithms/test/RealFFTTest.h b/Code/Mantid/Framework/Algorithms/test/RealFFTTest.h
index 7c1096571cc63f3351123c98df43ff203bdb5866..7bdcf51d2e9bfc787a3c5c60cc7a3ed772abbc9e 100644
--- a/Code/Mantid/Framework/Algorithms/test/RealFFTTest.h
+++ b/Code/Mantid/Framework/Algorithms/test/RealFFTTest.h
@@ -15,6 +15,9 @@ using namespace Mantid::API;
 class RealFFTTest : public CxxTest::TestSuite
 {
 public:
+  static RealFFTTest *createSuite() { return new RealFFTTest(); }
+  static void destroySuite(RealFFTTest *suite) { delete suite; }
+
   RealFFTTest():N(116),dX(0.3),XX(N*dX)
     {
 
diff --git a/Code/Mantid/Framework/Algorithms/test/SmoothDataTest.h b/Code/Mantid/Framework/Algorithms/test/SmoothDataTest.h
index 9d3d41743ef6d7f4d183017fc7e8e8a10934b9d2..73d3d5f41ed2c4e384c7594ca455b46edd3d7872 100644
--- a/Code/Mantid/Framework/Algorithms/test/SmoothDataTest.h
+++ b/Code/Mantid/Framework/Algorithms/test/SmoothDataTest.h
@@ -11,6 +11,9 @@ using namespace Mantid::Algorithms;
 class SmoothDataTest : public CxxTest::TestSuite
 {
 public:
+  static SmoothDataTest *createSuite() { return new SmoothDataTest(); }
+  static void destroySuite(SmoothDataTest *suite) { delete suite; }
+  
   SmoothDataTest()
   {
     // Set up a small workspace for testing