diff --git a/search-services/alfresco-solr/src/test/java/org/alfresco/solr/query/AlfrescoFTSQParserPluginTest.java b/search-services/alfresco-solr/src/test/java/org/alfresco/solr/query/AlfrescoFTSQParserPluginTest.java
index 8753fd7ca..e077c0b4e 100644
--- a/search-services/alfresco-solr/src/test/java/org/alfresco/solr/query/AlfrescoFTSQParserPluginTest.java
+++ b/search-services/alfresco-solr/src/test/java/org/alfresco/solr/query/AlfrescoFTSQParserPluginTest.java
@@ -521,14 +521,8 @@ public class AlfrescoFTSQParserPluginTest extends LoadAFTSTestData implements Qu
         assertAQuery(
                 "@" + SearchLanguageConversion.escapeLuceneQuery(mlQName.toString()) + ":banana", 1,
                 Locale.ITALIAN, null, null);
-
-        //TODO fix test
-        //INVESTIGATE
-            /*
-            assertAQuery(
-                    "@" + SearchLanguageConversion.escapeLuceneQuery(mlQName.toString()) + ":�?ナナ", 1, new Locale(
-                            "ja"), null, null);
-                            */
+        assertAQuery(
+                "@" + SearchLanguageConversion.escapeLuceneQuery(mlQName.toString())    + ":バナナ", 1, Locale.JAPANESE, null, null);
         assertAQuery(
                 "@" + SearchLanguageConversion.escapeLuceneQuery(mlQName.toString()) + ":바나나", 1, new Locale(
                         "ko"), null, null);
diff --git a/search-services/alfresco-solr/src/test/java/org/alfresco/solr/query/LoadAFTSTestData.java b/search-services/alfresco-solr/src/test/java/org/alfresco/solr/query/LoadAFTSTestData.java
index c87c28222..39892873b 100644
--- a/search-services/alfresco-solr/src/test/java/org/alfresco/solr/query/LoadAFTSTestData.java
+++ b/search-services/alfresco-solr/src/test/java/org/alfresco/solr/query/LoadAFTSTestData.java
@@ -229,7 +229,7 @@ public class LoadAFTSTestData extends AbstractAlfrescoSolrTests implements Alfre
         mlText.addValue(Locale.GERMAN, "banane");
         mlText.addValue(new Locale("el"), "μπανάνα");
         mlText.addValue(Locale.ITALIAN, "banana");
-        mlText.addValue(new Locale("ja"), "�?ナナ");
+        mlText.addValue(new Locale("ja"), "バナナ");
         mlText.addValue(new Locale("ko"), "바나나");
         mlText.addValue(new Locale("pt"), "banana");
         mlText.addValue(new Locale("ru"), "банан");