diff --git a/Framework/API/test/CMakeLists.txt b/Framework/API/test/CMakeLists.txt
index 05e00d44fb3b6236d748a5fad6887c22580af4b4..6c9d2daba95a320a33a947317c4f019760f58bb0 100644
--- a/Framework/API/test/CMakeLists.txt
+++ b/Framework/API/test/CMakeLists.txt
@@ -25,7 +25,8 @@ if ( CXXTEST_FOUND )
             ${Boost_LIBRARIES}
             ${POCO_LIBRARIES}
             ${MUPARSER_LIBRARIES}
-            ${GMOCK_LIBRARIES} )
+            ${GMOCK_LIBRARIES}
+            ${GTEST_LIBRARIES} )
 
   add_dependencies ( FrameworkTests APITest )
   # Test data
diff --git a/Framework/Algorithms/test/CMakeLists.txt b/Framework/Algorithms/test/CMakeLists.txt
index afbb274d9963dd9accc5237200ed613011e5dc0b..d49f10096861fd44b15e9c9dea3a0d74103bc760 100644
--- a/Framework/Algorithms/test/CMakeLists.txt
+++ b/Framework/Algorithms/test/CMakeLists.txt
@@ -51,7 +51,8 @@ if ( CXXTEST_FOUND )
             Nexus
             ${Boost_LIBRARIES}
             ${POCO_LIBRARIES}
-            ${GMOCK_LIBRARIES} )
+            ${GMOCK_LIBRARIES}
+            ${GTEST_LIBRARIES} )
   add_dependencies ( AlgorithmsTest Crystal CurveFitting )
   add_dependencies ( FrameworkTests AlgorithmsTest )
   # Test data
diff --git a/Framework/Beamline/test/CMakeLists.txt b/Framework/Beamline/test/CMakeLists.txt
index d216fa8efa305df469d52139ac1a522df737d42f..f4850009913fc0cc6c75b6e3b1977800c05cdb3c 100644
--- a/Framework/Beamline/test/CMakeLists.txt
+++ b/Framework/Beamline/test/CMakeLists.txt
@@ -5,7 +5,8 @@ if ( CXXTEST_FOUND )
   target_link_libraries( BeamlineTest LINK_PRIVATE ${TCMALLOC_LIBRARIES_LINKTIME}
     Beamline
     ${Boost_LIBRARIES}
-    ${GMOCK_LIBRARIES} )
+    ${GMOCK_LIBRARIES}
+    ${GTEST_LIBRARIES} )
 
   add_dependencies ( FrameworkTests BeamlineTest )
   # Add to the 'FrameworkTests' group in VS
diff --git a/Framework/Crystal/test/CMakeLists.txt b/Framework/Crystal/test/CMakeLists.txt
index 5c69a7f799430864fe2e52004c256e90fd34e7db..fe2d2ff09499a0c7bf8103fd3abf6365a645f73c 100644
--- a/Framework/Crystal/test/CMakeLists.txt
+++ b/Framework/Crystal/test/CMakeLists.txt
@@ -22,7 +22,8 @@ if ( CXXTEST_FOUND )
             MDAlgorithms
             ${Boost_LIBRARIES}
             ${POCO_LIBRARIES}
-            ${GMOCK_LIBRARIES} )
+            ${GMOCK_LIBRARIES}
+            ${GTEST_LIBRARIES} )
   add_dependencies ( CrystalTest Algorithms CurveFitting )
   add_dependencies ( FrameworkTests CrystalTest )
   # Test data
diff --git a/Framework/CurveFitting/test/CMakeLists.txt b/Framework/CurveFitting/test/CMakeLists.txt
index 9a850ccc050939ee3c73a0c00cf0803c4234d8a3..077bb0bbeda4ebacaf35ad1479cb26092b31d472 100644
--- a/Framework/CurveFitting/test/CMakeLists.txt
+++ b/Framework/CurveFitting/test/CMakeLists.txt
@@ -24,7 +24,8 @@ if ( CXXTEST_FOUND )
             ${GSL_LIBRARIES}
             ${Boost_LIBRARIES}
             ${POCO_LIBRARIES}
-            ${GMOCK_LIBRARIES} )
+            ${GMOCK_LIBRARIES}
+            ${GTEST_LIBRARIES} )
   add_dependencies ( CurveFittingTest Algorithms )
   add_dependencies ( FrameworkTests CurveFittingTest )
   # Test data
diff --git a/Framework/DataObjects/test/CMakeLists.txt b/Framework/DataObjects/test/CMakeLists.txt
index 692e14bfa611285d0b2b5710592de4a9484b66b7..254b2d341d3b2955e5d181b01230611b8ff7d58d 100644
--- a/Framework/DataObjects/test/CMakeLists.txt
+++ b/Framework/DataObjects/test/CMakeLists.txt
@@ -27,7 +27,8 @@ if ( CXXTEST_FOUND )
             ${JSONCPP_LIBRARIES}
             ${Boost_LIBRARIES}
             ${POCO_LIBRARIES}
-            ${GMOCK_LIBRARIES} )
+            ${GMOCK_LIBRARIES}
+            ${GTEST_LIBRARIES} )
   # Specify implicit dependency, but don't link to it
   add_dependencies ( FrameworkTests DataObjectsTest )
   # Add to the 'FrameworkTests' group in VS
diff --git a/Framework/Geometry/test/CMakeLists.txt b/Framework/Geometry/test/CMakeLists.txt
index 71d8b7e8c1cd0dfaecd8c9216bec9f53ad6e11b0..4487264dda50019c442bed94ee4a1f6d5ea76721 100644
--- a/Framework/Geometry/test/CMakeLists.txt
+++ b/Framework/Geometry/test/CMakeLists.txt
@@ -20,7 +20,8 @@ if ( CXXTEST_FOUND )
             ${GSL_LIBRARIES}
             ${Boost_LIBRARIES}
             ${POCO_LIBRARIES}
-            ${GMOCK_LIBRARIES} )
+            ${GMOCK_LIBRARIES}
+            ${GTEST_LIBRARIES} )
 
   add_dependencies ( FrameworkTests GeometryTest )
   # Add to the 'FrameworkTests' group in VS
diff --git a/Framework/HistogramData/test/CMakeLists.txt b/Framework/HistogramData/test/CMakeLists.txt
index a5a9c1817e65c78c755fefd265760a03ae68d615..8888a8552f39ba4c3748a790934ad474cd6cf5f2 100644
--- a/Framework/HistogramData/test/CMakeLists.txt
+++ b/Framework/HistogramData/test/CMakeLists.txt
@@ -5,7 +5,8 @@ if ( CXXTEST_FOUND )
   target_link_libraries( HistogramDataTest LINK_PRIVATE ${TCMALLOC_LIBRARIES_LINKTIME}
     HistogramData
     ${Boost_LIBRARIES}
-    ${GMOCK_LIBRARIES} )
+    ${GMOCK_LIBRARIES}
+    ${GTEST_LIBRARIES} )
 
   add_dependencies ( FrameworkTests HistogramDataTest )
   # Add to the 'FrameworkTests' group in VS
diff --git a/Framework/Indexing/test/CMakeLists.txt b/Framework/Indexing/test/CMakeLists.txt
index b861bfe8bed0b5a2e4ec7aacc28d0752560bca1f..6df06106b77c44893be09ab965d171f826e214db 100644
--- a/Framework/Indexing/test/CMakeLists.txt
+++ b/Framework/Indexing/test/CMakeLists.txt
@@ -5,7 +5,8 @@ if ( CXXTEST_FOUND )
   target_link_libraries( IndexingTest LINK_PRIVATE ${TCMALLOC_LIBRARIES_LINKTIME}
     Indexing
     ${Boost_LIBRARIES}
-    ${GMOCK_LIBRARIES} )
+    ${GMOCK_LIBRARIES}
+    ${GTEST_LIBRARIES} )
 
   add_dependencies ( FrameworkTests IndexingTest )
   # Add to the 'FrameworkTests' group in VS
diff --git a/Framework/Kernel/test/CMakeLists.txt b/Framework/Kernel/test/CMakeLists.txt
index 5a8db34bbebed64a4e99abc77778893c14b2008b..567e5b5ba93d1bda271a8cc8a41fed47b0f1ef31 100644
--- a/Framework/Kernel/test/CMakeLists.txt
+++ b/Framework/Kernel/test/CMakeLists.txt
@@ -15,6 +15,7 @@ if ( CXXTEST_FOUND )
             ${Boost_LIBRARIES}
             ${POCO_LIBRARIES}
             ${GMOCK_LIBRARIES}
+            ${GTEST_LIBRARIES}
             ${JSONCPP_LIBRARIES}
             ${TBB_LIBRARIES}
             ${TBB_MALLOC_LIBRARIES}
diff --git a/Framework/MDAlgorithms/test/CMakeLists.txt b/Framework/MDAlgorithms/test/CMakeLists.txt
index 39603ebb06749cb5d4121a1b34cd19265916dd6b..32b99b0e04cd0a3ae6f1c7bf8e5699aca80bdbcf 100644
--- a/Framework/MDAlgorithms/test/CMakeLists.txt
+++ b/Framework/MDAlgorithms/test/CMakeLists.txt
@@ -29,6 +29,7 @@ if ( CXXTEST_FOUND )
             ${POCO_LIBRARIES}
             ${MUPARSER_LIBRARIES}
             ${GMOCK_LIBRARIES}
+            ${GTEST_LIBRARIES}
             ${NEXUS_LIBRARIES}
             ${HDF5_LIBRARIES} )
 
diff --git a/Framework/RemoteAlgorithms/test/CMakeLists.txt b/Framework/RemoteAlgorithms/test/CMakeLists.txt
index b597f37db0cf737d56d297a6913b6802dd343d47..1db46d7bbd426eddfb6c335b837dc6c46ee83f9d 100644
--- a/Framework/RemoteAlgorithms/test/CMakeLists.txt
+++ b/Framework/RemoteAlgorithms/test/CMakeLists.txt
@@ -9,7 +9,8 @@ if ( CXXTEST_FOUND )
             RemoteAlgorithms
             ${Boost_LIBRARIES}
             ${POCO_LIBRARIES}
-            ${GMOCK_LIBRARIES} )
+            ${GMOCK_LIBRARIES}
+            ${GTEST_LIBRARIES} )
   add_dependencies ( FrameworkTests RemoteAlgorithmsTest )
   # Test data. Not using any for now. Remember to uncomment if data is added for these remote alg. tests
   # add_dependencies ( RemoteAlgorithmsTest StandardTestData )
diff --git a/Framework/RemoteJobManagers/test/CMakeLists.txt b/Framework/RemoteJobManagers/test/CMakeLists.txt
index fc66b01d6deabbf27bb677fb1ea23ac94e41cba8..f6c492b9623cf023ebede3d7e2e322eec4a26635 100644
--- a/Framework/RemoteJobManagers/test/CMakeLists.txt
+++ b/Framework/RemoteJobManagers/test/CMakeLists.txt
@@ -8,7 +8,8 @@ if ( CXXTEST_FOUND )
             RemoteJobManagers
             ${Boost_LIBRARIES}
             ${POCO_LIBRARIES}
-            ${GMOCK_LIBRARIES} )
+            ${GMOCK_LIBRARIES}
+            ${GTEST_LIBRARIES} )
   add_dependencies ( FrameworkTests RemoteJobManagersTest )
   # Test data. Not using any for now. Remember to uncomment if data is added for these remote job managers
   # add_dependencies ( RemoteJobManagersTest StandardTestData )
diff --git a/Framework/SINQ/test/CMakeLists.txt b/Framework/SINQ/test/CMakeLists.txt
index 20a9d10956aaf3100469867de94805a2012a5869..457205b9558863d11401fe65bf3d74e47559d2db 100644
--- a/Framework/SINQ/test/CMakeLists.txt
+++ b/Framework/SINQ/test/CMakeLists.txt
@@ -16,7 +16,8 @@ if ( CXXTEST_FOUND )
             SINQ
             CurveFitting
             ${MANTIDLIBS}
-            ${GMOCK_LIBRARIES} )
+            ${GMOCK_LIBRARIES}
+            ${GTEST_LIBRARIES} )
 
   # Test data
   add_dependencies ( PSISINQTest StandardTestData )
diff --git a/Framework/ScriptRepository/test/CMakeLists.txt b/Framework/ScriptRepository/test/CMakeLists.txt
index 24b5adfef3704131e064b18d3728e9fb9fdca96d..07c02b4684923f47a2ed6c8da4358ffe03e9f51f 100644
--- a/Framework/ScriptRepository/test/CMakeLists.txt
+++ b/Framework/ScriptRepository/test/CMakeLists.txt
@@ -11,7 +11,8 @@ if ( CXXTEST_FOUND )
             ScriptRepository
             ${Boost_LIBRARIES}
             ${POCO_LIBRARIES}
-            ${GMOCK_LIBRARIES} )
+            ${GMOCK_LIBRARIES}
+            ${GTEST_LIBRARIES} )
 
   add_dependencies ( FrameworkTests ScriptRepositoryTest )
   # Add to the 'FrameworkTests' group in VS
diff --git a/Framework/Types/test/CMakeLists.txt b/Framework/Types/test/CMakeLists.txt
index 751e4834b0e99ef1c49b0ee9f6175144353a15fd..ab7cb3387659a179461a744d33e6d15608e0abf3 100644
--- a/Framework/Types/test/CMakeLists.txt
+++ b/Framework/Types/test/CMakeLists.txt
@@ -4,7 +4,8 @@ if ( CXXTEST_FOUND )
   cxxtest_add_test ( TypesTest ${TEST_FILES} ${GMOCK_TEST_FILES})
   target_link_libraries( TypesTest LINK_PRIVATE ${TCMALLOC_LIBRARIES_LINKTIME}
     ${Boost_LIBRARIES}
-    ${GMOCK_LIBRARIES} )
+    ${GMOCK_LIBRARIES}
+    ${GTEST_LIBRARIES} )
 
   add_dependencies ( FrameworkTests TypesTest )
   # Add to the 'FrameworkTests' group in VS
diff --git a/MantidQt/API/test/CMakeLists.txt b/MantidQt/API/test/CMakeLists.txt
index eb8e92a6b549105fcc7c1f3bc77e5451d5123a0d..9e8925d1bd61145e0a81827cfbbdf222989a1084 100644
--- a/MantidQt/API/test/CMakeLists.txt
+++ b/MantidQt/API/test/CMakeLists.txt
@@ -25,7 +25,8 @@ if ( CXXTEST_FOUND )
             ${QWT_LIBRARIES}
             ${Boost_LIBRARIES}
             ${POCO_LIBRARIES}
-            ${GMOCK_LIBRARIES} )
+            ${GMOCK_LIBRARIES}
+            ${GTEST_LIBRARIES} )
     add_dependencies( GUITests MantidQtAPITest )
 
     # Add to the 'UnitTests' group in VS
diff --git a/MantidQt/CustomInterfaces/test/CMakeLists.txt b/MantidQt/CustomInterfaces/test/CMakeLists.txt
index 5d5d30c3ce98c8501398c0b7bb99305672a952c0..38d369761c1762a4975faf1c6f19f4383bc40bcf 100644
--- a/MantidQt/CustomInterfaces/test/CMakeLists.txt
+++ b/MantidQt/CustomInterfaces/test/CMakeLists.txt
@@ -24,7 +24,8 @@ if ( CXXTEST_FOUND )
             ${POCO_LIBRARIES}
             ${QWT_LIBRARIES}
             ${QT_LIBRARIES}
-            ${GMOCK_LIBRARIES} )
+            ${GMOCK_LIBRARIES}
+            ${GTEST_LIBRARIES} )
 
   add_dependencies( CustomInterfacesTest MDAlgorithms )
   # Test data
diff --git a/MantidQt/MantidWidgets/test/CMakeLists.txt b/MantidQt/MantidWidgets/test/CMakeLists.txt
index bfbac70ad00c82529ff6dc1329aebf61e4441ed4..70a8d3d5cfa32e75ef05cecb7b1a9da36eb6776c 100644
--- a/MantidQt/MantidWidgets/test/CMakeLists.txt
+++ b/MantidQt/MantidWidgets/test/CMakeLists.txt
@@ -20,6 +20,7 @@ if ( CXXTEST_FOUND )
             ${Boost_LIBRARIES}
             ${POCO_LIBRARIES}
             ${GMOCK_LIBRARIES}
+            ${GTEST_LIBRARIES}
             )
 
   # Add to the 'UnitTests' group in VS
diff --git a/MantidQt/SliceViewer/CMakeLists.txt b/MantidQt/SliceViewer/CMakeLists.txt
index e6605ffb07768940e65a86f794301988ed940f82..360b003d77b6349d0cd6a7f4019d6849fd7c051b 100644
--- a/MantidQt/SliceViewer/CMakeLists.txt
+++ b/MantidQt/SliceViewer/CMakeLists.txt
@@ -200,7 +200,8 @@ if ( CXXTEST_FOUND )
             ${Boost_LIBRARIES}
             ${POCO_LIBRARIES}
             ${QT_LIBRARIES}
-            ${GMOCK_LIBRARIES} )
+            ${GMOCK_LIBRARIES}
+            ${GTEST_LIBRARIES} )
 
   add_dependencies( GUITests SliceViewerTest )
   # Add to the 'UnitTests' group in VS
diff --git a/MantidQt/SliceViewer/test/CMakeLists.txt b/MantidQt/SliceViewer/test/CMakeLists.txt
index 5061fd18eebfba14cc1c45dab9f31f3dbb9da29b..88e1b728830cde65fab0d2c3e5cee8b92b8be5d7 100644
--- a/MantidQt/SliceViewer/test/CMakeLists.txt
+++ b/MantidQt/SliceViewer/test/CMakeLists.txt
@@ -26,7 +26,8 @@ if ( CXXTEST_FOUND )
             ${QWT_LIBRARIES}
             ${Boost_LIBRARIES}
             ${POCO_LIBRARIES}
-            ${GMOCK_LIBRARIES} )
+            ${GMOCK_LIBRARIES}
+            ${GTEST_LIBRARIES} )
 
     add_dependencies( GUITests SliceViewerTest )
 
diff --git a/Vates/VatesAPI/CMakeLists.txt b/Vates/VatesAPI/CMakeLists.txt
index 6c3bc24731c8c7f84b53d63e11bdd99100ae5a25..fd87cd22eeec866a78eb87805343876398530b33 100644
--- a/Vates/VatesAPI/CMakeLists.txt
+++ b/Vates/VatesAPI/CMakeLists.txt
@@ -268,6 +268,7 @@ target_link_libraries( VatesAPITest LINK_PRIVATE ${TCMALLOC_LIBRARIES_LINKTIME}
   ${POCO_LIBRARIES}
   ${Boost_LIBRARIES}
   ${GMOCK_LIBRARIES}
+  ${GTEST_LIBRARIES}
   ${QWT_LIBRARIES}
   Qt4::QtCore
   )
diff --git a/Vates/VatesSimpleGui/ViewWidgets/CMakeLists.txt b/Vates/VatesSimpleGui/ViewWidgets/CMakeLists.txt
index bd36633fb7edc239ebe1487f9dfc4efff5f2cf54..306d8931c18e8e42e06c928d901434c7733e313e 100644
--- a/Vates/VatesSimpleGui/ViewWidgets/CMakeLists.txt
+++ b/Vates/VatesSimpleGui/ViewWidgets/CMakeLists.txt
@@ -177,7 +177,8 @@ target_link_libraries( VatesSimpleGuiViewWidgetsTest LINK_PRIVATE ${TCMALLOC_LIB
   ${MANTID_SUBPROJECT_LIBS}
   ${POCO_LIBRARIES}
   ${Boost_LIBRARIES}
-  ${GMOCK_LIBRARIES} )
+  ${GMOCK_LIBRARIES}
+  ${GTEST_LIBRARIES} )
 
 add_dependencies( AllTests VatesSimpleGuiViewWidgetsTest )
 # Add to the 'UnitTests' group in VS