diff --git a/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/ConcurrentHashSetTest.java b/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/ConcurrentHashSetTest.java
index 7dbc96c57b..b2bdc6099c 100644
--- a/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/ConcurrentHashSetTest.java
+++ b/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/ConcurrentHashSetTest.java
@@ -105,8 +105,6 @@ public class ConcurrentHashSetTest extends Assert {
       }
    }
 
-   // TestCase overrides --------------------------------------------
-
    @Before
    public void setUp() throws Exception {
       set = new ConcurrentHashSet<>();
diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQBytesMessage.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQBytesMessage.java
index d6e4541dc0..348ec07e9f 100644
--- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQBytesMessage.java
+++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQBytesMessage.java
@@ -322,8 +322,6 @@ public class ActiveMQBytesMessage extends ActiveMQMessage implements BytesMessag
       bodyLength = message.getBodySize();
    }
 
-   // ActiveMQRAMessage overrides ----------------------------------------
-
    @Override
    public void clearBody() throws JMSException {
       super.clearBody();
diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMapMessage.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMapMessage.java
index f9559ec5a4..bf1e0593cc 100644
--- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMapMessage.java
+++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMapMessage.java
@@ -301,8 +301,6 @@ public class ActiveMQMapMessage extends ActiveMQMessage implements MapMessage {
       return map.containsProperty(new SimpleString(name));
    }
 
-   // ActiveMQRAMessage overrides ----------------------------------------
-
    @Override
    public void clearBody() throws JMSException {
       super.clearBody();
diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQStreamMessage.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQStreamMessage.java
index c0ab87e27c..2b0b2ded3e 100644
--- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQStreamMessage.java
+++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQStreamMessage.java
@@ -341,8 +341,6 @@ public class ActiveMQStreamMessage extends ActiveMQMessage implements StreamMess
       getBuffer().resetReaderIndex();
    }
 
-   // ActiveMQRAMessage overrides ----------------------------------------
-
    @Override
    public void clearBody() throws JMSException {
       super.clearBody();
diff --git a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/impl/JMSBridgeImpl.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/impl/JMSBridgeImpl.java
index f9dc9f7630..f35d41f895 100644
--- a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/impl/JMSBridgeImpl.java
+++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/impl/JMSBridgeImpl.java
@@ -327,8 +327,6 @@ public final class JMSBridgeImpl implements JMSBridge {
       }
    }
 
-   // ActiveMQComponent overrides --------------------------------------------------
-
    @Override
    public JMSBridgeImpl setBridgeName(String name) {
       this.bridgeName = name;
diff --git a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/converter/coreWrapper/CoreStreamMessageWrapper.java b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/converter/coreWrapper/CoreStreamMessageWrapper.java
index ec28c0ff38..f55c7057c6 100644
--- a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/converter/coreWrapper/CoreStreamMessageWrapper.java
+++ b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/converter/coreWrapper/CoreStreamMessageWrapper.java
@@ -305,8 +305,6 @@ public final class CoreStreamMessageWrapper extends CoreMessageWrapper {
       getWriteBodyBuffer().resetReaderIndex();
    }
 
-   // ActiveMQRAMessage overrides ----------------------------------------
-
    @Override
    public void clearBody() {
       super.clearBody();
diff --git a/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/AmqpTransactionCoordinator.java b/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/AmqpTransactionCoordinator.java
index bc1030e4c0..ebc964dfee 100644
--- a/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/AmqpTransactionCoordinator.java
+++ b/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/AmqpTransactionCoordinator.java
@@ -177,8 +177,6 @@ public class AmqpTransactionCoordinator extends AmqpAbstractResource<Sender> {
       sendTxCommand(message);
    }
 
-   //----- Base class overrides ---------------------------------------------//
-
    @Override
    public void remotelyClosed(AmqpConnection connection) {
 
diff --git a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/xa/XATest.java b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/xa/XATest.java
index 80183d533b..f3f4b2d8cc 100644
--- a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/xa/XATest.java
+++ b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/xa/XATest.java
@@ -58,8 +58,6 @@ public class XATest extends JMSTestBase {
    protected Queue queue1;
 
 
-   // TestCase overrides -------------------------------------------
-
    @Override
    @Before
    public void setUp() throws Exception {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/FloodServerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/FloodServerTest.java
index 0c1069f8c7..56e5d2cb94 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/FloodServerTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/FloodServerTest.java
@@ -47,11 +47,6 @@ public class FloodServerTest extends ActiveMQTestBase {
    private final String topicName = "my-topic";
 
 
-   // TestCase overrides -------------------------------------------
-
-
-
-
    @Override
    @Before
    public void setUp() throws Exception {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/util/JMSClusteredTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/util/JMSClusteredTestBase.java
index c6467fcd9d..dd29b42b65 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/util/JMSClusteredTestBase.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/util/JMSClusteredTestBase.java
@@ -63,13 +63,6 @@ public class JMSClusteredTestBase extends ActiveMQTestBase {
 
    protected static final int MAX_HOPS = 1;
 
-
-
-   // TestCase overrides -------------------------------------------
-
-
-
-
    /**
     * @throws Exception
     */
@@ -180,7 +173,4 @@ public class JMSClusteredTestBase extends ActiveMQTestBase {
 
       return configuration;
    }
-
-
-
 }
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/ConnectionClosedTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/ConnectionClosedTest.java
index 9846da4785..79c0703700 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/ConnectionClosedTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/ConnectionClosedTest.java
@@ -37,9 +37,6 @@ import org.junit.Test;
 public class ConnectionClosedTest extends JMSTestCase {
 
 
-   // TestCase overrides -------------------------------------------
-
-
    @Test
    public void testCloseOnce() throws Exception {
       Connection conn = createConnection();
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/ConnectionTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/ConnectionTest.java
index 4bc33cb739..e04d3f8bc1 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/ConnectionTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/ConnectionTest.java
@@ -39,9 +39,6 @@ public class ConnectionTest extends JMSTestCase {
    private static final JmsTestLogger log = JmsTestLogger.LOGGER;
 
 
-   // TestCase overrides -------------------------------------------
-
-
    @Test
    public void testManyConnections() throws Exception {
       for (int i = 0; i < 100; i++) {
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/MessageWithReadResolveTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/MessageWithReadResolveTest.java
index ef50413174..89e9ddf717 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/MessageWithReadResolveTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/MessageWithReadResolveTest.java
@@ -35,9 +35,6 @@ import org.junit.Test;
 public class MessageWithReadResolveTest extends JMSTestCase {
 
 
-   // TestCase overrides -------------------------------------------
-
-
    @Test
    public void testSendReceiveMessage() throws Exception {
       Connection conn = createConnection();
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/VersionLoaderTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/VersionLoaderTest.java
index 4fba4efb95..758d505084 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/VersionLoaderTest.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/VersionLoaderTest.java
@@ -43,9 +43,4 @@ public class VersionLoaderTest extends ActiveMQTestBase {
       Assert.assertEquals(Integer.parseInt(new StringTokenizer(props.getProperty("activemq.version.incrementingVersion"), ",").nextToken()), version.getIncrementingVersion());
    }
 
-   // Z implementation ----------------------------------------------
-
-   // Y overrides ---------------------------------------------------
-
-
 }