diff --git a/elasticsearch/x-pack/license-plugin/src/test/java/org/elasticsearch/shield/authz/AuthorizationUtilsTest.java b/elasticsearch/x-pack/license-plugin/src/test/java/org/elasticsearch/shield/authz/AuthorizationUtilsTests.java
similarity index 97%
rename from elasticsearch/x-pack/license-plugin/src/test/java/org/elasticsearch/shield/authz/AuthorizationUtilsTest.java
rename to elasticsearch/x-pack/license-plugin/src/test/java/org/elasticsearch/shield/authz/AuthorizationUtilsTests.java
index 41abbb37b04..648cb0d2d7e 100644
--- a/elasticsearch/x-pack/license-plugin/src/test/java/org/elasticsearch/shield/authz/AuthorizationUtilsTest.java
+++ b/elasticsearch/x-pack/license-plugin/src/test/java/org/elasticsearch/shield/authz/AuthorizationUtilsTests.java
@@ -18,7 +18,7 @@ import static org.hamcrest.Matchers.is;
 /**
  * Unit tests for the AuthorizationUtils class
  */
-public class AuthorizationUtilsTest extends ESTestCase {
+public class AuthorizationUtilsTests extends ESTestCase {
 
     private ThreadContext threadContext;
 
diff --git a/elasticsearch/x-pack/marvel/src/test/java/org/elasticsearch/marvel/agent/collector/AbstractCollectorTestCase.java b/elasticsearch/x-pack/marvel/src/test/java/org/elasticsearch/marvel/agent/collector/AbstractCollectorTestCase.java
index e64e488cddf..0c0cc7f61f5 100644
--- a/elasticsearch/x-pack/marvel/src/test/java/org/elasticsearch/marvel/agent/collector/AbstractCollectorTestCase.java
+++ b/elasticsearch/x-pack/marvel/src/test/java/org/elasticsearch/marvel/agent/collector/AbstractCollectorTestCase.java
@@ -42,7 +42,7 @@ import java.util.concurrent.TimeUnit;
 import static org.elasticsearch.common.unit.TimeValue.timeValueMinutes;
 
 @ClusterScope(scope = ESIntegTestCase.Scope.SUITE, randomDynamicTemplates = false, transportClientRatio = 0.0)
-public class AbstractCollectorTestCase extends MarvelIntegTestCase {
+public abstract class AbstractCollectorTestCase extends MarvelIntegTestCase {
 
     @Override
     protected Collection<Class<? extends Plugin>> nodePlugins() {