diff --git a/modules/test/integration/src/test/java/org/elasticsearch/test/integration/recovery/RecoveryWhileUnderLoadTests.java b/modules/test/integration/src/test/java/org/elasticsearch/test/integration/recovery/RecoveryWhileUnderLoadTests.java
new file mode 100644
index 00000000000..f65a1815cb2
--- /dev/null
+++ b/modules/test/integration/src/test/java/org/elasticsearch/test/integration/recovery/RecoveryWhileUnderLoadTests.java
@@ -0,0 +1,101 @@
+/*
+ * Licensed to Elastic Search and Shay Banon under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. Elastic Search licenses this
+ * file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.elasticsearch.test.integration.recovery;
+
+import org.elasticsearch.common.collect.MapBuilder;
+import org.elasticsearch.test.integration.AbstractNodesTests;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.Test;
+
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicLong;
+
+import static org.elasticsearch.index.query.xcontent.QueryBuilders.*;
+import static org.hamcrest.MatcherAssert.*;
+import static org.hamcrest.Matchers.*;
+
+/**
+ * @author kimchy (shay.banon)
+ */
+public class RecoveryWhileUnderLoadTests extends AbstractNodesTests {
+
+    @AfterMethod public void shutdownNodes() {
+        closeAllNodes();
+    }
+
+    @Test public void recoverWhileUnderLoadTest() throws Exception {
+        startNode("server1");
+
+        client("server1").admin().indices().prepareCreate("test").execute().actionGet();
+
+        final AtomicLong idGenerator = new AtomicLong();
+        final AtomicBoolean stop = new AtomicBoolean(false);
+        Thread[] writers = new Thread[5];
+        final CountDownLatch stopLatch = new CountDownLatch(writers.length);
+        for (int i = 0; i < writers.length; i++) {
+            writers[i] = new Thread() {
+                @Override public void run() {
+                    while (!stop.get()) {
+                        long id = idGenerator.incrementAndGet();
+                        client("server1").prepareIndex("test", "type1", Long.toString(id))
+                                .setSource(MapBuilder.<String, Object>newMapBuilder().put("test", "value" + id).map()).execute().actionGet();
+                    }
+                    stopLatch.countDown();
+                }
+            };
+            writers[i].start();
+        }
+
+        // wait till we index 2000
+        while (client("server1").prepareCount().setQuery(matchAllQuery()).execute().actionGet().count() < 2000) {
+            Thread.sleep(100);
+            client("server1").admin().indices().prepareRefresh().execute().actionGet();
+        }
+
+        // now flush, just to make sure we have some data in the index, not just translog
+        client("server1").admin().indices().prepareFlush().execute().actionGet();
+
+
+        // wait till we index another 2000
+        while (client("server1").prepareCount().setQuery(matchAllQuery()).execute().actionGet().count() < 4000) {
+            Thread.sleep(100);
+            client("server1").admin().indices().prepareRefresh().execute().actionGet();
+        }
+
+        // now start another node, while we index
+        startNode("server2");
+
+
+        // wait till we index 10,0000
+        while (client("server1").prepareCount().setQuery(matchAllQuery()).execute().actionGet().count() < 10000) {
+            Thread.sleep(100);
+            client("server1").admin().indices().prepareRefresh().execute().actionGet();
+        }
+
+        stop.set(true);
+        stopLatch.await();
+
+        client("server1").admin().indices().prepareRefresh().execute().actionGet();
+        for (int i = 0; i < 10; i++) {
+            assertThat(client("server1").prepareCount().setQuery(matchAllQuery()).execute().actionGet().count(), equalTo(idGenerator.get()));
+        }
+    }
+}