diff --git a/src/test/java/org/elasticsearch/river/RiverTests.java b/src/test/java/org/elasticsearch/river/RiverTests.java
index 9cf698d661d..6587ca84c72 100644
--- a/src/test/java/org/elasticsearch/river/RiverTests.java
+++ b/src/test/java/org/elasticsearch/river/RiverTests.java
@@ -20,6 +20,8 @@
 package org.elasticsearch.river;
 
 import com.google.common.base.Predicate;
+
+import org.apache.lucene.util.LuceneTestCase.AwaitsFix;
 import org.elasticsearch.action.get.GetResponse;
 import org.elasticsearch.action.get.MultiGetItemResponse;
 import org.elasticsearch.action.get.MultiGetRequestBuilder;
@@ -29,15 +31,16 @@ import org.elasticsearch.common.xcontent.json.JsonXContent;
 import org.elasticsearch.index.mapper.MapperService;
 import org.elasticsearch.river.dummy.DummyRiverModule;
 import org.elasticsearch.test.ElasticsearchIntegrationTest;
+import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope;
 import org.junit.Test;
 
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
-import static org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope;
 import static org.hamcrest.Matchers.equalTo;
 
 @ClusterScope(scope = ElasticsearchIntegrationTest.Scope.SUITE)
+@AwaitsFix(bugUrl="occasionally fails apparently due to synchronous mappings updates")
 public class RiverTests extends ElasticsearchIntegrationTest {
 
     @Test
@@ -46,7 +49,6 @@ public class RiverTests extends ElasticsearchIntegrationTest {
     }
 
     @Test
-    @AwaitsFix(bugUrl="occasionally fails apparently due to synchronous mappings updates")
     public void testMultipleRiversStart() throws Exception {
         int nbRivers = between(2,10);
         logger.info("-->  testing with {} rivers...", nbRivers);