diff --git a/.idea/libraries/lucene.xml b/.idea/libraries/lucene.xml
index e8261cc4ad5..3762118a2e9 100644
--- a/.idea/libraries/lucene.xml
+++ b/.idea/libraries/lucene.xml
@@ -1,13 +1,21 @@
 <component name="libraryTable">
   <library name="lucene">
     <CLASSES>
-      <root url="jar://$GRADLE_REPOSITORY$/org.apache.lucene/lucene-queries/jars/lucene-queries-3.0.0.jar!/" />
-      <root url="jar://$GRADLE_REPOSITORY$/org.apache.lucene/lucene-core/jars/lucene-core-3.0.0.jar!/" />
-      <root url="jar://$GRADLE_REPOSITORY$/org.apache.lucene/lucene-analyzers/jars/lucene-analyzers-3.0.0.jar!/" />
+      <root url="jar://$GRADLE_REPOSITORY$/org.apache.lucene/lucene-core/jars/lucene-core-3.0.1.jar!/" />
+      <root url="jar://$GRADLE_REPOSITORY$/org.apache.lucene/lucene-analyzers/jars/lucene-analyzers-3.0.1.jar!/" />
+      <root url="jar://$GRADLE_REPOSITORY$/org.apache.lucene/lucene-queries/jars/lucene-queries-3.0.1.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
-      <root url="file://$PROJECT_DIR$/../../../opt/lucene/3.0.0.src/src/java" />
+      <root url="file://$PROJECT_DIR$/../../../opt/lucene/3.0.1.src/contrib/spellchecker/src/java" />
+      <root url="file://$PROJECT_DIR$/../../../opt/lucene/3.0.1.src/contrib/analyzers/common/src/java" />
+      <root url="file://$PROJECT_DIR$/../../../opt/lucene/3.0.1.src/contrib/queries/src/java" />
+      <root url="file://$PROJECT_DIR$/../../../opt/lucene/3.0.1.src/contrib/highlighter/src/java" />
+      <root url="file://$PROJECT_DIR$/../../../opt/lucene/3.0.1.src/contrib/snowball/src/java" />
+      <root url="file://$PROJECT_DIR$/../../../opt/lucene/3.0.1.src/src/java" />
+      <root url="file://$PROJECT_DIR$/../../../opt/lucene/3.0.1.src/contrib/analyzers/smartcn/src/java" />
+      <root url="file://$PROJECT_DIR$/../../../opt/lucene/3.0.1.src/contrib/fast-vector-highlighter/src/java" />
+      <root url="file://$PROJECT_DIR$/../../../opt/lucene/3.0.1.src/contrib/spatial/src/java" />
     </SOURCES>
   </library>
 </component>
\ No newline at end of file
diff --git a/modules/elasticsearch/build.gradle b/modules/elasticsearch/build.gradle
index 7a2c0a9ad6f..52a8588d2cc 100644
--- a/modules/elasticsearch/build.gradle
+++ b/modules/elasticsearch/build.gradle
@@ -46,9 +46,9 @@ dependencies {
     compile 'com.google.inject.extensions:guice-assisted-inject:2.0'
     compile 'com.google.inject.extensions:guice-multibindings:2.0'
 
-    compile 'org.apache.lucene:lucene-core:3.0.0'
-    compile 'org.apache.lucene:lucene-analyzers:3.0.0'
-    compile 'org.apache.lucene:lucene-queries:3.0.0'
+    compile 'org.apache.lucene:lucene-core:3.0.1'
+    compile 'org.apache.lucene:lucene-analyzers:3.0.1'
+    compile 'org.apache.lucene:lucene-queries:3.0.1'
 
     compile('jgroups:jgroups:2.9.0.GA') { transitive = false }
     compile('org.jboss.netty:netty:3.1.5.GA') { transitive = false }
diff --git a/modules/test/integration/src/test/java/org/elasticsearch/test/integration/document/DocumentActionsTests.java b/modules/test/integration/src/test/java/org/elasticsearch/test/integration/document/DocumentActionsTests.java
index 457d2c7e5ab..d31b8ea3b26 100644
--- a/modules/test/integration/src/test/java/org/elasticsearch/test/integration/document/DocumentActionsTests.java
+++ b/modules/test/integration/src/test/java/org/elasticsearch/test/integration/document/DocumentActionsTests.java
@@ -19,6 +19,8 @@
 
 package org.elasticsearch.test.integration.document;
 
+import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse;
+import org.elasticsearch.action.admin.cluster.health.ClusterHealthStatus;
 import org.elasticsearch.action.admin.indices.flush.FlushResponse;
 import org.elasticsearch.action.admin.indices.optimize.OptimizeResponse;
 import org.elasticsearch.action.admin.indices.refresh.RefreshResponse;
@@ -53,7 +55,12 @@ public class DocumentActionsTests extends AbstractServersTests {
 
         logger.info("Creating index test");
         client("server1").admin().indices().create(createIndexRequest("test")).actionGet();
-        Thread.sleep(200);
+
+        logger.info("Running Cluster Health");
+        ClusterHealthResponse clusterHealth = client("server1").admin().cluster().health(clusterHealth().waitForGreenStatus()).actionGet();
+        logger.info("Done Cluster Health, status " + clusterHealth.status());
+        assertThat(clusterHealth.timedOut(), equalTo(false));
+        assertThat(clusterHealth.status(), equalTo(ClusterHealthStatus.GREEN));
 
         logger.info("Indexing [type1/1]");
         IndexResponse indexResponse = client("server1").index(indexRequest("test").type("type1").id("1").source(source("1", "test"))).actionGet();