diff --git a/config/root-config.in b/config/root-config.in
index f464422e58e6f..3750c097b4eec 100755
--- a/config/root-config.in
+++ b/config/root-config.in
@@ -73,7 +73,7 @@ fi
 newlib="-lNew"
 rootglibs="-lGui"
 rootevelibs="-lEve -lEG -lGeom -lGed -lRGL"
-rootlibs="-lCore -lImt -lRIO -lNet -lHist -lGraf -lGraf3d -lTGeometry -lGpad -lROOTVecOps -lTree -lTreePlayer\
+rootlibs="-lCore -lImt -lRIO -lNet -lHist -lGraf -lGraf3d -lGpad -lROOTVecOps -lTree -lTreePlayer\
           -lRint -lPostscript -lMatrix -lPhysics -lMathCore -lThread -lROOTNTuple -lROOTNTupleUtil"
 
 # MultiProc is not supported on Windows
@@ -85,6 +85,10 @@ if echo "${features}" | grep -q "dataframe"; then
    rootlibs="$rootlibs -lROOTDataFrame"
 fi
 
+if echo "${features}" | grep -q "geom"; then
+   rootlibs="$rootlibs -lTGeometry"
+fi
+
 if test "$platform" = "win32"; then
    rootulibs="-include:_G__cpp_setupG__Net        \
               -include:_G__cpp_setupG__IO         \
diff --git a/test/PostInstall/CMakeLists.txt b/test/PostInstall/CMakeLists.txt
index d25749949ca22..46db8536bf0df 100644
--- a/test/PostInstall/CMakeLists.txt
+++ b/test/PostInstall/CMakeLists.txt
@@ -18,6 +18,24 @@ if(BUILD_TESTING)
     WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
   set_tests_properties(run-hsimple   PROPERTIES FIXTURES_SETUP    HSIMPLE)
   set_tests_properties(read-hsimple  PROPERTIES FIXTURES_REQUIRED HSIMPLE)
+
+  # Add a test to check root-config gives the right compiler invocation flags
+  execute_process(
+    COMMAND ${ROOT_BINDIR}/root-config --cflags --libs
+    OUTPUT_VARIABLE ROOT_CONFIG_OUTPUT_STR
+    OUTPUT_STRIP_TRAILING_WHITESPACE)
+  # Pass a list to the compiler invocation to avoid errors such as "invalid library name" when passing the quoted string
+  # output from root-config
+  string(REPLACE " " ";" ROOT_CONFIG_OUTPUT "${ROOT_CONFIG_OUTPUT_STR}")
+  add_test(NAME read-hsimple-root-config-build
+    COMMAND ${CMAKE_CXX_COMPILER} -o readHSimple-root-config ${CMAKE_SOURCE_DIR}/readHSimple.cxx ${ROOT_CONFIG_OUTPUT}
+    WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
+  add_test(NAME read-hsimple-root-config-run
+    COMMAND readHSimple-root-config
+    WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
+  set_tests_properties(read-hsimple-root-config-build   PROPERTIES FIXTURES_SETUP    HSIMPLE-ROOT-CONFIG)
+  set_tests_properties(read-hsimple-root-config-run     PROPERTIES FIXTURES_REQUIRED "HSIMPLE;HSIMPLE-ROOT-CONFIG")
+
   if(ROOT_pyroot_FOUND)
     find_package(Python3 3.10 REQUIRED)
     # Need to duplicate the import ROOT test because the PASS_REGULAR_EXPRESSION