diff --git a/src/lib/format-util.hpp b/src/lib/format-util.hpp
index c060299f7..8ead91fab 100644
--- a/src/lib/format-util.hpp
+++ b/src/lib/format-util.hpp
@@ -48,6 +48,11 @@
 #include <boost/utility/enable_if.hpp>
 
 
+namespace lib {
+namespace test{ // see test-helper.cpp
+    std::string demangleCxx (lib::Literal rawName);
+}}
+
 
 namespace util {
   
@@ -107,7 +112,7 @@ namespace util {
   inline string
   tyStr (const TY* =0)
   {
-    return string("«")+typeid(TY).name()+"»";
+    return "«"+ lib::test::demangleCxx (typeid(TY).name())+"»";
   }
   
   template<typename TY>