diff --git a/source/java/org/alfresco/repo/search/SearcherComponentTest.java b/source/java/org/alfresco/repo/search/SearcherComponentTest.java
index ec70fc74b5..c366bef2b3 100644
--- a/source/java/org/alfresco/repo/search/SearcherComponentTest.java
+++ b/source/java/org/alfresco/repo/search/SearcherComponentTest.java
@@ -313,11 +313,14 @@ public class SearcherComponentTest extends TestCase
         assertEquals(1, answer.size());
 
         System.out.println("Encoded = "+ISO9075.encode(COMPLEX_LOCAL_NAME));
-        for(int i = 0; i < COMPLEX_LOCAL_NAME.length(); i++)
+        String roundTrip = ISO9075.decode(ISO9075.encode(COMPLEX_LOCAL_NAME));
+        for(int i = 0; i < COMPLEX_LOCAL_NAME.length() && 1 < roundTrip.length(); i++)
         {
-            System.out.println("Char at "+i+" = "+Integer.toHexString(COMPLEX_LOCAL_NAME.charAt(i)));
+            System.out.println("Char at "+i+" = "+Integer.toHexString(COMPLEX_LOCAL_NAME.charAt(i))+ "   ...    "+Integer.toHexString(roundTrip.charAt(i)));
         }
         
+        assertEquals( COMPLEX_LOCAL_NAME, roundTrip);
+        
         answer = searcher.selectNodes(rootNodeRef, "//*[like(@test:"
                 + ISO9075.encode(COMPLEX_LOCAL_NAME) + ", 'm__k%', false)]", null, namespacePrefixResolver, false);
         assertEquals(1, answer.size());