diff --git a/Framework/CMakeLists.txt b/Framework/CMakeLists.txt
index 4e35f1b7697fbf71a2f1195f540459433bb99ad5..594e0bb4406a6ccee97dcba9f30ec5b8360decea 100644
--- a/Framework/CMakeLists.txt
+++ b/Framework/CMakeLists.txt
@@ -68,11 +68,13 @@ add_dependencies ( check FrameworkTests )
 
 include_directories (Kernel/inc)
 add_subdirectory (Kernel)
-set ( MANTIDLIBS ${MANTIDLIBS} Kernel )
 
 include_directories (HistogramData/inc)
 add_subdirectory (HistogramData)
+
+# HistogramData has header-only dependency on Kernel, so Kernel comes after.
 set ( MANTIDLIBS ${MANTIDLIBS} HistogramData )
+set ( MANTIDLIBS ${MANTIDLIBS} Kernel )
 
 include_directories (Geometry/inc)
 # muParser needed by Geometry and subsequent packages
diff --git a/Framework/HistogramData/test/CMakeLists.txt b/Framework/HistogramData/test/CMakeLists.txt
index bec96c9d8499ae6c92a9c76a5830c9f7c83cf4f6..63fa7501775429fac7275bcb7840c8d341b2c649 100644
--- a/Framework/HistogramData/test/CMakeLists.txt
+++ b/Framework/HistogramData/test/CMakeLists.txt
@@ -4,7 +4,6 @@ if ( CXXTEST_FOUND )
   cxxtest_add_test ( HistogramDataTest ${TEST_FILES} ${GMOCK_TEST_FILES})
   target_link_libraries( HistogramDataTest LINK_PRIVATE ${TCMALLOC_LIBRARIES_LINKTIME}
     HistogramData
-    Kernel
     ${Boost_LIBRARIES}
     ${GTEST_LIBRARIES} )