diff --git a/test/common/str-helper.h b/test/common/str-helper.h
new file mode 100644
index 00000000000..f879d339c86
--- /dev/null
+++ b/test/common/str-helper.h
@@ -0,0 +1,23 @@
+#ifndef TEST_COMMON_HELPER_H
+#define TEST_COMMON_HELPER_H
+
+#include "common/str.h"
+
+namespace CxxTest
+{
+    CXXTEST_TEMPLATE_INSTANTIATION
+    class ValueTraits<const Common::String &>
+    {
+        ValueTraits &operator=( const ValueTraits & );
+		Common::String _str;
+
+    public:
+        ValueTraits( const Common::String &value ) : _str( value ) {}
+        ValueTraits( const ValueTraits &other ) : _str( other._str ) {}
+        const char *asString( void ) const { return _str.c_str(); }
+    };
+	CXXTEST_COPY_CONST_TRAITS( Common::String &);
+	CXXTEST_COPY_TRAITS( Common::String, const Common::String &);
+}
+
+#endif
diff --git a/test/common/str.h b/test/common/str.h
index 6827ec91e94..06a066b1387 100644
--- a/test/common/str.h
+++ b/test/common/str.h
@@ -3,6 +3,8 @@
 #include "common/str.h"
 #include "common/ustr.h"
 
+#include "test/common/str-helper.h"
+
 class StringTestSuite : public CxxTest::TestSuite
 {
 	public: