diff --git a/src/test/java/org/elasticsearch/shield/audit/logfile/LoggingAuditTrailTests.java b/src/test/java/org/elasticsearch/shield/audit/logfile/LoggingAuditTrailTests.java
index 48484aee324..ed5bbdc78fb 100644
--- a/src/test/java/org/elasticsearch/shield/audit/logfile/LoggingAuditTrailTests.java
+++ b/src/test/java/org/elasticsearch/shield/audit/logfile/LoggingAuditTrailTests.java
@@ -5,10 +5,8 @@
  */
 package org.elasticsearch.shield.audit.logfile;
 
-import com.carrotsearch.randomizedtesting.annotations.Repeat;
 import org.elasticsearch.action.IndicesRequest;
 import org.elasticsearch.action.support.IndicesOptions;
-import org.elasticsearch.common.SuppressForbidden;
 import org.elasticsearch.common.bytes.BytesArray;
 import org.elasticsearch.common.bytes.BytesReference;
 import org.elasticsearch.common.network.NetworkUtils;
@@ -41,8 +39,6 @@ import static org.mockito.Mockito.when;
 /**
  *
  */
-@SuppressForbidden(reason = "this test should repeat")
-@Repeat(iterations = 10)
 public class LoggingAuditTrailTests extends ElasticsearchTestCase {
 
     private static enum RestContent {
@@ -483,8 +479,7 @@ public class LoggingAuditTrailTests extends ElasticsearchTestCase {
         }
     }
 
-    @SuppressForbidden(reason = "this test should repeat")
-    @Test @Repeat(iterations = 10)
+    @Test
     public void testOriginAttributes() throws Exception {
         MockMessage message = new MockMessage();
         String text = LoggingAuditTrail.originAttributes(message);
diff --git a/src/test/java/org/elasticsearch/shield/authc/esusers/ESUsersRealmTests.java b/src/test/java/org/elasticsearch/shield/authc/esusers/ESUsersRealmTests.java
index 3fd037617c6..930295fbffb 100644
--- a/src/test/java/org/elasticsearch/shield/authc/esusers/ESUsersRealmTests.java
+++ b/src/test/java/org/elasticsearch/shield/authc/esusers/ESUsersRealmTests.java
@@ -5,7 +5,6 @@
  */
 package org.elasticsearch.shield.authc.esusers;
 
-import com.carrotsearch.randomizedtesting.annotations.Repeat;
 import com.google.common.collect.ImmutableSet;
 import org.elasticsearch.action.Action;
 import org.elasticsearch.action.ActionListener;
@@ -16,7 +15,6 @@ import org.elasticsearch.client.Client;
 import org.elasticsearch.client.ClusterAdminClient;
 import org.elasticsearch.client.IndicesAdminClient;
 import org.elasticsearch.client.support.Headers;
-import org.elasticsearch.common.SuppressForbidden;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.env.Environment;
 import org.elasticsearch.rest.BaseRestHandler;
@@ -82,8 +80,7 @@ public class ESUsersRealmTests extends ElasticsearchTestCase {
         assertThat(user.roles(), arrayContaining("role1", "role2"));
     }
 
-    @SuppressForbidden(reason = "this test should repeat")
-    @Test @Repeat(iterations = 20)
+    @Test
     public void testAuthenticate_Caching() throws Exception {
         Settings settings = Settings.builder()
                 .put("cache.hash_algo", Hasher.values()[randomIntBetween(0, Hasher.values().length - 1)].name().toLowerCase(Locale.ROOT))
diff --git a/src/test/java/org/elasticsearch/shield/support/ValidationTests.java b/src/test/java/org/elasticsearch/shield/support/ValidationTests.java
index 364628a5d8e..7fc073cfd67 100644
--- a/src/test/java/org/elasticsearch/shield/support/ValidationTests.java
+++ b/src/test/java/org/elasticsearch/shield/support/ValidationTests.java
@@ -5,8 +5,6 @@
  */
 package org.elasticsearch.shield.support;
 
-import com.carrotsearch.randomizedtesting.annotations.Repeat;
-import org.elasticsearch.common.SuppressForbidden;
 import org.elasticsearch.test.ElasticsearchTestCase;
 import org.junit.Test;
 
@@ -20,7 +18,6 @@ import static org.hamcrest.Matchers.nullValue;
 /**
  *
  */
-@SuppressForbidden(reason = "these tests should repeat")
 public class ValidationTests extends ElasticsearchTestCase {
 
 
@@ -41,14 +38,13 @@ public class ValidationTests extends ElasticsearchTestCase {
     }
 
     @Test
-    @Repeat(iterations = 100)
     public void testESUsers_validateUsername() throws Exception {
         int length = randomIntBetween(1, 30);
         String name = new String(generateValidName(length));
         assertThat(Validation.ESUsers.validateUsername(name), nullValue());
     }
 
-    @Test @Repeat(iterations = 100)
+    @Test
     public void testESUsers_validateUsername_Invalid_Length() throws Exception {
         int length = frequently() ? randomIntBetween(31, 200) : 0; // invalid length
         char[] name = new char[length];
@@ -58,14 +54,14 @@ public class ValidationTests extends ElasticsearchTestCase {
         assertThat(Validation.ESUsers.validateUsername(new String(name)), notNullValue());
     }
 
-    @Test @Repeat(iterations = 100)
+    @Test
     public void testESUsers_validateUsername_Invalid_Characters() throws Exception {
         int length = randomIntBetween(1, 30); // valid length
         String name = new String(generateInvalidName(length));
         assertThat(Validation.ESUsers.validateUsername(name), notNullValue());
     }
 
-    @Test @Repeat(iterations = 100)
+    @Test
     public void testESUsers_validatePassword() throws Exception {
         String passwd = randomAsciiOfLength(randomIntBetween(0, 20));
         logger.info(passwd + "[{}]", passwd.length());
@@ -76,14 +72,14 @@ public class ValidationTests extends ElasticsearchTestCase {
         }
     }
 
-    @Test @Repeat(iterations = 100)
+    @Test
     public void testRoles_validateRoleName() throws Exception {
         int length = randomIntBetween(1, 30);
         String name = new String(generateValidName(length));
         assertThat(Validation.Roles.validateRoleName(name), nullValue());
     }
 
-    @Test @Repeat(iterations = 100)
+    @Test
     public void testRoles_validateRoleName_Invalid_Length() throws Exception {
         int length = frequently() ? randomIntBetween(31, 200) : 0; // invalid length
         char[] name = new char[length];
@@ -93,7 +89,7 @@ public class ValidationTests extends ElasticsearchTestCase {
         assertThat(Validation.ESUsers.validateUsername(new String(name)), notNullValue());
     }
 
-    @Test @Repeat(iterations = 100)
+    @Test
     public void testRoles_validateRoleName_Invalid_Characters() throws Exception {
         int length = randomIntBetween(1, 30); // valid length
         String name = new String(generateInvalidName(length));