diff --git a/Code/Mantid/Framework/API/CMakeLists.txt b/Code/Mantid/Framework/API/CMakeLists.txt
index d67ba3fabb63e2023e3ccfad9ad16d945f51cf05..1eafbc8a87746b6c06c6834ec217e1b1ee134c56 100644
--- a/Code/Mantid/Framework/API/CMakeLists.txt
+++ b/Code/Mantid/Framework/API/CMakeLists.txt
@@ -188,4 +188,5 @@ target_link_libraries ( API ${MANTIDLIBS} ${WINSOCK} )
 if ( CXXTEST_FOUND )
   cxxtest_add_test ( APITest ${TEST_FILES} )
   target_link_libraries( APITest API )
+  add_dependencies ( FrameworkTests APITest )
 endif ()
diff --git a/Code/Mantid/Framework/Algorithms/CMakeLists.txt b/Code/Mantid/Framework/Algorithms/CMakeLists.txt
index 8590afe2585764f2b899581e4378b319e5cf2932..3c34d5bbb877c80490617ab887f71e5c8f665b16 100644
--- a/Code/Mantid/Framework/Algorithms/CMakeLists.txt
+++ b/Code/Mantid/Framework/Algorithms/CMakeLists.txt
@@ -376,5 +376,6 @@ target_link_libraries ( Algorithms ${MANTIDLIBS} ${GSL_LIBRARIES} )
 if ( CXXTEST_FOUND )
   include_directories ( ../CurveFitting/inc ../DataHandling/inc ../Nexus/inc )
   cxxtest_add_test ( AlgorithmsTest ${TEST_FILES} )
-  target_link_libraries( AlgorithmsTest Algorithms CurveFitting DataHandling Nexus )
+  target_link_libraries ( AlgorithmsTest Algorithms CurveFitting DataHandling Nexus )
+  add_dependencies ( FrameworkTests AlgorithmsTest )
 endif ()
diff --git a/Code/Mantid/Framework/CMakeLists.txt b/Code/Mantid/Framework/CMakeLists.txt
index d4883b507e39b3ef787352a93efcc98b6b599d84..f02caad068e8a7f6347cec435cf5391090f7e97a 100644
--- a/Code/Mantid/Framework/CMakeLists.txt
+++ b/Code/Mantid/Framework/CMakeLists.txt
@@ -70,6 +70,8 @@ endif ()
 # Now add the packages one-by-one, building up the dependencies as we go
 ###########################################################################
 
+add_custom_target ( FrameworkTests ) # target for all framework tests
+
 include_directories (Kernel/inc)
 add_subdirectory (Kernel)
 set ( MANTIDLIBS ${MANTIDLIBS} Kernel )
@@ -115,4 +117,4 @@ if ( ${MAKE_VATES} )
   set ( FRAMEWORK_LIBS ${FRAMEWORK_LIBS} MDDataObjects MDAlgorithms )
 endif ()
 
-add_custom_target ( Framework DEPENDS ${FRAMEWORK_LIBS} )
\ No newline at end of file
+add_custom_target ( Framework DEPENDS ${FRAMEWORK_LIBS} )
diff --git a/Code/Mantid/Framework/CurveFitting/CMakeLists.txt b/Code/Mantid/Framework/CurveFitting/CMakeLists.txt
index 988688d7379f318b916a64e1a20c590c54363070..1c423f423d482c596383c9d6c1bc250b22e04507 100644
--- a/Code/Mantid/Framework/CurveFitting/CMakeLists.txt
+++ b/Code/Mantid/Framework/CurveFitting/CMakeLists.txt
@@ -113,4 +113,5 @@ if ( CXXTEST_FOUND )
   include_directories ( ../DataHandling/inc ../Nexus/inc )
   cxxtest_add_test ( CurveFittingTest ${TEST_FILES} )
   target_link_libraries( CurveFittingTest CurveFitting DataHandling Nexus )
+  add_dependencies ( FrameworkTests CurveFittingTest )
 endif ()
diff --git a/Code/Mantid/Framework/DataHandling/CMakeLists.txt b/Code/Mantid/Framework/DataHandling/CMakeLists.txt
index 9bff5d9914abfe981eb789f6524e988d59ff075e..f702bb94c4fb969f38bd3411ad759a5165d10038 100644
--- a/Code/Mantid/Framework/DataHandling/CMakeLists.txt
+++ b/Code/Mantid/Framework/DataHandling/CMakeLists.txt
@@ -182,4 +182,5 @@ if ( CXXTEST_FOUND )
   include_directories ( ../Nexus/inc )
   cxxtest_add_test ( DataHandlingTest ${TEST_FILES} )
   target_link_libraries( DataHandlingTest DataHandling Nexus )
+  add_dependencies ( FrameworkTests DataHandlingTest )
 endif ()
diff --git a/Code/Mantid/Framework/DataObjects/CMakeLists.txt b/Code/Mantid/Framework/DataObjects/CMakeLists.txt
index 483ad36d018276ecb24839dc664a73cebb25f666..df5fd1d3a9fa156d9cf04f9fe658f4dcc0adfa06 100644
--- a/Code/Mantid/Framework/DataObjects/CMakeLists.txt
+++ b/Code/Mantid/Framework/DataObjects/CMakeLists.txt
@@ -58,7 +58,7 @@ include_directories ( ${ZLIB_INCLUDE_DIRS} )
 target_link_libraries ( DataObjects ${MANTIDLIBS} ${ZLIB_LIBRARIES} )
 
 if ( CXXTEST_FOUND )
-  #include_directories ( ../Nexus/inc )
   cxxtest_add_test ( DataObjectsTest ${TEST_FILES} )
   target_link_libraries( DataObjectsTest DataObjects )
+  add_dependencies ( FrameworkTests DataObjectsTest )
 endif ()
diff --git a/Code/Mantid/Framework/Geometry/CMakeLists.txt b/Code/Mantid/Framework/Geometry/CMakeLists.txt
index bb4723e530b4a99a0aab1c76d24100223fcaed69..91e499d43b1ef89a5f47ca9552c8846b064d16ac 100644
--- a/Code/Mantid/Framework/Geometry/CMakeLists.txt
+++ b/Code/Mantid/Framework/Geometry/CMakeLists.txt
@@ -221,4 +221,5 @@ target_link_libraries ( Geometry ${MANTIDLIBS} ${OPENCASCADE_LIBRARIES} ${OPENGL
 if ( CXXTEST_FOUND )
   cxxtest_add_test ( GeometryTest ${TEST_FILES} )
   target_link_libraries( GeometryTest Geometry )
+  add_dependencies ( FrameworkTests GeometryTest )
 endif ()
\ No newline at end of file
diff --git a/Code/Mantid/Framework/ICat/CMakeLists.txt b/Code/Mantid/Framework/ICat/CMakeLists.txt
index 71b9a9f1275f07f9d35a5377771b3a2559917b1d..cd778aba400511603d80c123e6e203295f1f115c 100644
--- a/Code/Mantid/Framework/ICat/CMakeLists.txt
+++ b/Code/Mantid/Framework/ICat/CMakeLists.txt
@@ -69,4 +69,5 @@ target_link_libraries ( ICat ${MANTIDLIBS} ${OPENSSL_LIBRARIES} )
 if ( CXXTEST_FOUND )
   cxxtest_add_test ( ICatTest ${TEST_FILES} )
   target_link_libraries( ICatTest ICat )
+  add_dependencies ( FrameworkTests ICatTest )
 endif ()
diff --git a/Code/Mantid/Framework/Kernel/CMakeLists.txt b/Code/Mantid/Framework/Kernel/CMakeLists.txt
index 3bfa10f2a776dea80d3110563adcd6b11efc9d43..cf0fa554b47e0f6107014b3c06538b331a3791b9 100644
--- a/Code/Mantid/Framework/Kernel/CMakeLists.txt
+++ b/Code/Mantid/Framework/Kernel/CMakeLists.txt
@@ -202,4 +202,5 @@ add_custom_command ( TARGET Kernel POST_BUILD
 if ( CXXTEST_FOUND )
   cxxtest_add_test ( KernelTest ${TEST_FILES} )
   target_link_libraries( KernelTest Kernel )
+  add_dependencies ( FrameworkTests KernelTest )
 endif ()
diff --git a/Code/Mantid/Framework/Nexus/CMakeLists.txt b/Code/Mantid/Framework/Nexus/CMakeLists.txt
index fea64772611b2d48dcc3ed88c06e9c71fcbe7b91..3abab817ff648120959348cff8b701eb34dd85a4 100644
--- a/Code/Mantid/Framework/Nexus/CMakeLists.txt
+++ b/Code/Mantid/Framework/Nexus/CMakeLists.txt
@@ -86,4 +86,5 @@ if ( CXXTEST_FOUND )
   include_directories (../DataHandling/inc )
   cxxtest_add_test ( NexusTest ${TEST_FILES} )
   target_link_libraries( NexusTest Nexus DataHandling )
+  add_dependencies ( FrameworkTests NexusTest )
 endif ()
diff --git a/Code/Mantid/Framework/PythonAPI/CMakeLists.txt b/Code/Mantid/Framework/PythonAPI/CMakeLists.txt
index f6cff2790b0725df26a52fc7f78fe3063ff2b0d8..3ec51b159f754e9f379f64d2347ead2f89c55a6c 100644
--- a/Code/Mantid/Framework/PythonAPI/CMakeLists.txt
+++ b/Code/Mantid/Framework/PythonAPI/CMakeLists.txt
@@ -66,4 +66,5 @@ if ( CXXTEST_FOUND )
   include_directories ( ../DataHandling/inc ../DataObjects/inc )
   cxxtest_add_test ( PythonAPITest ${TEST_FILES} )
   target_link_libraries( PythonAPITest PythonAPI DataHandling DataObjects )
+  add_dependencies ( FrameworkTests PythonAPITest )
 endif ()