diff --git a/pom.xml b/pom.xml
index b0bebf5f1773e..a69328813af00 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.elasticsearch</groupId>
     <artifactId>elasticsearch-analysis-kuromoji</artifactId>
-    <version>1.8.0-SNAPSHOT</version>
+    <version>2.0.0.RC1-SNAPSHOT</version>
     <packaging>jar</packaging>
     <description>Japanese (kuromoji) Analysis for ElasticSearch</description>
     <inceptionYear>2009</inceptionYear>
@@ -31,7 +31,7 @@
     </parent>
 
     <properties>
-        <elasticsearch.version>0.90.8</elasticsearch.version>
+        <elasticsearch.version>1.0.0.RC1-SNAPSHOT</elasticsearch.version>
         <lucene.version>4.6.0</lucene.version>
         <tests.jvms>1</tests.jvms>
         <tests.shuffle>true</tests.shuffle>
diff --git a/src/main/java/org/elasticsearch/index/analysis/KuromojiTokenizerFactory.java b/src/main/java/org/elasticsearch/index/analysis/KuromojiTokenizerFactory.java
index e051f861ffed7..99175aa1e5ccc 100644
--- a/src/main/java/org/elasticsearch/index/analysis/KuromojiTokenizerFactory.java
+++ b/src/main/java/org/elasticsearch/index/analysis/KuromojiTokenizerFactory.java
@@ -23,7 +23,7 @@
 import org.apache.lucene.analysis.ja.JapaneseTokenizer;
 import org.apache.lucene.analysis.ja.JapaneseTokenizer.Mode;
 import org.apache.lucene.analysis.ja.dict.UserDictionary;
-import org.elasticsearch.ElasticSearchException;
+import org.elasticsearch.ElasticsearchException;
 import org.elasticsearch.common.inject.Inject;
 import org.elasticsearch.common.inject.assistedinject.Assisted;
 import org.elasticsearch.common.settings.Settings;
@@ -66,7 +66,7 @@ public static UserDictionary getUserDictionary(Environment env, Settings setting
                 }
             }
         } catch (IOException e) {
-            throw new ElasticSearchException("failed to load kuromoji user dictionary", e);
+            throw new ElasticsearchException("failed to load kuromoji user dictionary", e);
         }
     }
 
diff --git a/src/test/resources/log4j.properties b/src/test/resources/log4j.properties
new file mode 100644
index 0000000000000..497c97f995974
--- /dev/null
+++ b/src/test/resources/log4j.properties
@@ -0,0 +1,5 @@
+log4j.rootLogger=INFO, out
+
+log4j.appender.out=org.apache.log4j.ConsoleAppender
+log4j.appender.out.layout=org.apache.log4j.PatternLayout
+log4j.appender.out.layout.conversionPattern=[%d{ISO8601}][%-5p][%-25c] %m%n