2 files changed, 7 insertions, 23 deletions
diff --git a/core/src/test/java/org/elasticsearch/versioning/ConcurrentDocumentOperationIT.java b/core/src/test/java/org/elasticsearch/versioning/ConcurrentDocumentOperationIT.java
index 402ec0d8dc..bb8636d36e 100644
--- a/core/src/test/java/org/elasticsearch/versioning/ConcurrentDocumentOperationIT.java
+++ b/core/src/test/java/org/elasticsearch/versioning/ConcurrentDocumentOperationIT.java
@@ -22,7 +22,6 @@ package org.elasticsearch.versioning;
 import org.elasticsearch.action.ActionListener;
 import org.elasticsearch.action.index.IndexResponse;
 import org.elasticsearch.test.ESIntegTestCase;
-import org.junit.Test;
 
 import java.util.Map;
 import java.util.concurrent.CountDownLatch;
@@ -37,10 +36,7 @@ import static org.hamcrest.Matchers.nullValue;
  *
  */
 public class ConcurrentDocumentOperationIT extends ESIntegTestCase {
-
-    @Test
-    public void concurrentOperationOnSameDocTest() throws Exception {
-
+    public void testConcurrentOperationOnSameDoc() throws Exception {
         logger.info("--> create an index with 1 shard and max replicas based on nodes");
         assertAcked(prepareCreate("test")
                 .setSettings(settingsBuilder().put(indexSettings()).put("index.number_of_shards", 1)));
diff --git a/core/src/test/java/org/elasticsearch/versioning/SimpleVersioningIT.java b/core/src/test/java/org/elasticsearch/versioning/SimpleVersioningIT.java
index 93c29e0c92..edbbebbbc4 100644
--- a/core/src/test/java/org/elasticsearch/versioning/SimpleVersioningIT.java
+++ b/core/src/test/java/org/elasticsearch/versioning/SimpleVersioningIT.java
@@ -31,9 +31,13 @@ import org.elasticsearch.index.VersionType;
 import org.elasticsearch.index.engine.FlushNotAllowedEngineException;
 import org.elasticsearch.index.engine.VersionConflictEngineException;
 import org.elasticsearch.test.ESIntegTestCase;
-import org.junit.Test;
 
-import java.util.*;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Random;
+import java.util.Set;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.atomic.AtomicInteger;
 
@@ -47,8 +51,6 @@ import static org.hamcrest.Matchers.lessThanOrEqualTo;
  *
  */
 public class SimpleVersioningIT extends ESIntegTestCase {
-
-    @Test
     public void testExternalVersioningInitialDelete() throws Exception {
         createIndex("test");
         ensureGreen();
@@ -69,7 +71,6 @@ public class SimpleVersioningIT extends ESIntegTestCase {
         assertThat(indexResponse.getVersion(), equalTo(18L));
     }
 
-    @Test
     public void testForce() throws Exception {
         createIndex("test");
         ensureGreen("test"); // we are testing force here which doesn't work if we are recovering at the same time - zzzzz...
@@ -100,7 +101,6 @@ public class SimpleVersioningIT extends ESIntegTestCase {
         assertThat(deleteResponse.getVersion(), equalTo(v));
     }
 
-    @Test
     public void testExternalGTE() throws Exception {
         createIndex("test");
 
@@ -147,7 +147,6 @@ public class SimpleVersioningIT extends ESIntegTestCase {
         assertThat(deleteResponse.getVersion(), equalTo(18l));
     }
 
-    @Test
     public void testExternalVersioning() throws Exception {
         createIndex("test");
         ensureGreen();
@@ -211,7 +210,6 @@ public class SimpleVersioningIT extends ESIntegTestCase {
         assertThat(indexResponse.getVersion(), equalTo(20l));
     }
 
-    @Test
     public void testRequireUnitsOnUpdateSettings() throws Exception {
         createIndex("test");
         ensureGreen();
@@ -226,7 +224,6 @@ public class SimpleVersioningIT extends ESIntegTestCase {
         }
     }
 
-    @Test
     public void testInternalVersioningInitialDelete() throws Exception {
         createIndex("test");
         ensureGreen();
@@ -239,8 +236,6 @@ public class SimpleVersioningIT extends ESIntegTestCase {
         assertThat(indexResponse.getVersion(), equalTo(1l));
     }
 
-
-    @Test
     public void testInternalVersioning() throws Exception {
         createIndex("test");
         ensureGreen();
@@ -298,7 +293,6 @@ public class SimpleVersioningIT extends ESIntegTestCase {
         assertThat(deleteResponse.getVersion(), equalTo(4l));
     }
 
-    @Test
     public void testSimpleVersioningWithFlush() throws Exception {
         createIndex("test");
         ensureGreen();
@@ -336,7 +330,6 @@ public class SimpleVersioningIT extends ESIntegTestCase {
         }
     }
 
-    @Test
     public void testVersioningWithBulk() {
         createIndex("test");
         ensureGreen();
@@ -521,8 +514,6 @@ public class SimpleVersioningIT extends ESIntegTestCase {
         }
     }
 
-
-    @Test
     public void testRandomIDsAndVersions() throws Exception {
         createIndex("test");
         ensureGreen();
@@ -719,7 +710,6 @@ public class SimpleVersioningIT extends ESIntegTestCase {
         }
     }
 
-    @Test
     public void testDeleteNotLost() throws Exception {
 
         // We require only one shard for this test, so that the 2nd delete provokes pruning the deletes map:
@@ -799,9 +789,7 @@ public class SimpleVersioningIT extends ESIntegTestCase {
                 equalTo(-1L));
     }
 
-    @Test
     public void testGCDeletesZero() throws Exception {
-
         createIndex("test");
         ensureGreen();