diff --git a/LHCbG4Tests/G4RichTbSimHTest/CMakeLists.txt b/LHCbG4Tests/G4RichTbSimHTest/CMakeLists.txt
index 0cd59f13b4cf192239b17220d3bad1e2dae0e4dd..8f09070aa0d419e20e028a4ed3e0c53310edfa0d 100644
--- a/LHCbG4Tests/G4RichTbSimHTest/CMakeLists.txt
+++ b/LHCbG4Tests/G4RichTbSimHTest/CMakeLists.txt
@@ -6,7 +6,7 @@ find_package(CLHEP REQUIRED COMPONENTS Random)
 find_package(ROOT REQUIRED COMPONENTS Hist Tree RIO)
 find_package(TBB)
 
-include_directories(${CMAKE_INSTALL_PREFIX}/include)
+include_directories(SYSTEM ${CMAKE_INSTALL_PREFIX}/include ${CLHEP_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS})
 link_directories(${CMAKE_INSTALL_PREFIX}/lib)
 
 set(Geant4_LIBRARIES
@@ -39,7 +39,4 @@ gaudi_add_executable(G4RichTbSimHTest
 
 add_dependencies(G4RichTbSimHTest Geant4)
 
-# Dirty fix to disable the pesky warning
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-suggest-override")
-
 gaudi_install_scripts()