diff --git a/CMakeModules/Findtinyxml.cmake b/CMakeModules/Findtinyxml.cmake
index 4c7cbde895eaaeb3e324bad5bd073de695bb87c1..fe55d8cdac4c66b5b47abf089725e668284f9e60 100644
--- a/CMakeModules/Findtinyxml.cmake
+++ b/CMakeModules/Findtinyxml.cmake
@@ -6,11 +6,8 @@
 # TINYXML_INCLUDE_DIR - where to find tinyxml.h, etc.
 # TINYXML_LIBRARIES - List of libraries when using TinyXML.
 #
+INCLUDE( "FindPackageHandleStandardArgs" )
 
-IF( TINYXML_INCLUDE_DIRS)
-# Already in cache, be silent
-SET( TinyXML_FIND_QUIETLY TRUE )
-ENDIF( TINYXML_INCLUDE_DIRS )
 
 FIND_PATH( TINYXML_INCLUDE_DIRS "tinyxml.h"
 PATH_SUFFIXES "tinyxml" )
@@ -21,7 +18,4 @@ PATH_SUFFIXES "tinyxml" )
 
 # handle the QUIETLY and REQUIRED arguments and set TINYXML_FOUND to TRUE if
 # all listed variables are TRUE
-INCLUDE( "FindPackageHandleStandardArgs" )
 FIND_PACKAGE_HANDLE_STANDARD_ARGS( "TinyXML" DEFAULT_MSG TINYXML_INCLUDE_DIRS TINYXML_LIBRARY_DIRS )
-
-MARK_AS_ADVANCED( TINYXML_INCLUDE_DIRS TINYXML_LIBRARY_DIRS )
\ No newline at end of file
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 3242bd247df674c9e103974cfa7aac475bd6c22d..4f3794abbc2e4869eb564c932496cd051107698f 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -36,5 +36,14 @@ if (FCL_HAVE_OCTOMAP)
 endif()
 
 if (FCL_HAVE_TINYXML)
-#  add_fcl_test(test_fcl_xmldata test_fcl_xmldata.cpp test_fcl_utility.cpp libsvm/svm.cpp)
+  add_executable(test_fcl_xmldata test_fcl_xmldata.cpp test_fcl_utility.cpp libsvm/svm.cpp)
+  target_link_libraries(test_fcl_xmldata
+    fcl
+    ${TINYXML_LIBRARY_DIRS}
+    ${Boost_SYSTEM_LIBRARY}
+    ${Boost_THREAD_LIBRARY}
+    ${Boost_DATE_TIME_LIBRARY}
+    ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
+  add_test(test_fcl_xmldata ${EXECUTABLE_OUTPUT_PATH}/test_fcl_xmldata)
+
 endif()