diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ConsumerWindowSizeTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ConsumerWindowSizeTest.java
index 5bd3ea014a..d3adee0fe9 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ConsumerWindowSizeTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ConsumerWindowSizeTest.java
@@ -44,6 +44,7 @@ import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger;
 import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
 import org.junit.Assert;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 
 public class ConsumerWindowSizeTest extends ActiveMQTestBase {
@@ -542,8 +543,9 @@ public class ConsumerWindowSizeTest extends ActiveMQTestBase {
       internalTestSlowConsumerNoBuffer(false);
    }
 
-   // I believe this test became invalid after we started using another thread to deliver the large message
-   public void disabled_testSlowConsumerNoBufferLargeMessages() throws Exception {
+   @Test
+   @Ignore("I believe this test became invalid after we started using another thread to deliver the large message")
+   public void testSlowConsumerNoBufferLargeMessages() throws Exception {
       internalTestSlowConsumerNoBuffer(true);
    }
 
@@ -559,13 +561,12 @@ public class ConsumerWindowSizeTest extends ActiveMQTestBase {
          server.start();
 
          locator.setConsumerWindowSize(0);
+         if (largeMessages) {
+            locator.setMinLargeMessageSize(100);
+         }
 
          ClientSessionFactory sf = createSessionFactory(locator);
 
-         if (largeMessages) {
-            sf.getServerLocator().setMinLargeMessageSize(100);
-         }
-
          session = sf.createSession(false, true, true);
 
          SimpleString ADDRESS = addressA;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/ClusteredRequestResponseTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/ClusteredRequestResponseTest.java
index efbbac8243..63acca77a7 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/ClusteredRequestResponseTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/ClusteredRequestResponseTest.java
@@ -18,6 +18,7 @@ package org.apache.activemq.artemis.tests.integration.cluster.distribution;
 
 import org.apache.activemq.artemis.core.server.cluster.impl.MessageLoadBalancingType;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 
 public class ClusteredRequestResponseTest extends ClusterTestBase {
@@ -83,7 +84,9 @@ public class ClusteredRequestResponseTest extends ClusterTestBase {
     *
     * TODO: I believe this test is invalid. I'm just ignoring it for now. It will probably go away
     */
-   public void invalidTest_testRequestResponseNoWaitForBindings() throws Exception {
+   @Test
+   @Ignore
+   public void testRequestResponseNoWaitForBindings() throws Exception {
       setupCluster();
 
       startServers(0, 1, 2, 3, 4);
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/PreACKJMSTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/PreACKJMSTest.java
index cc96f08311..e6b23dea43 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/PreACKJMSTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/PreACKJMSTest.java
@@ -29,6 +29,7 @@ import org.apache.activemq.artemis.api.core.client.ActiveMQClient;
 import org.apache.activemq.artemis.api.jms.JMSFactoryType;
 import org.apache.activemq.artemis.tests.util.JMSTestBase;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 
 public class PreACKJMSTest extends JMSTestBase {
@@ -95,7 +96,9 @@ public class PreACKJMSTest extends JMSTestBase {
       assertNull("ConnectionFactory is on PreACK mode, the message shouldn't be received", msg2);
    }
 
-   public void disabled_testPreACKTransactional() throws Exception {
+   @Test
+   @Ignore
+   public void testPreACKTransactional() throws Exception {
       conn = cf.createConnection();
       Session sess = conn.createSession(true, Session.SESSION_TRANSACTED);
 
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/SimpleOpenWireTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/SimpleOpenWireTest.java
index 4c5b957573..618249bcac 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/SimpleOpenWireTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/SimpleOpenWireTest.java
@@ -72,6 +72,7 @@ import org.apache.activemq.command.ActiveMQQueue;
 import org.apache.activemq.command.ActiveMQTopic;
 import org.junit.Assert;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 
 public class SimpleOpenWireTest extends BasicOpenWireTest {
@@ -526,7 +527,8 @@ public class SimpleOpenWireTest extends BasicOpenWireTest {
       }
    }
 
-   //   @Test -- ignored for now
+   @Test
+   @Ignore("ignored for now")
    public void testKeepAlive() throws Exception {
       connection.start();
 
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/security/SecurityTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/security/SecurityTest.java
index 6ff547b5b1..6d5b77d226 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/security/SecurityTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/security/SecurityTest.java
@@ -62,6 +62,7 @@ import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
 import org.apache.activemq.artemis.tests.util.CreateMessage;
 import org.junit.Assert;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 
 public class SecurityTest extends ActiveMQTestBase {
@@ -1605,7 +1606,9 @@ public class SecurityTest extends ActiveMQTestBase {
 
    }
 
-   public void _testComplexRoles2() throws Exception {
+   @Test
+   @Ignore
+   public void testComplexRoles2() throws Exception {
       ActiveMQServer server = createServer();
       server.start();
       ActiveMQJAASSecurityManager securityManager = (ActiveMQJAASSecurityManager) server.getSecurityManager();
@@ -1645,8 +1648,8 @@ public class SecurityTest extends ActiveMQTestBase {
       ClientSession andrewConnection = null;
       ClientSession frankConnection = null;
       ClientSession samConnection = null;
+      locator.setBlockOnNonDurableSend(true).setBlockOnDurableSend(true);
       ClientSessionFactory factory = createSessionFactory(locator);
-      factory.getServerLocator().setBlockOnNonDurableSend(true).setBlockOnDurableSend(true);
 
       ClientSession adminSession = factory.createSession("all", "all", false, true, true, false, -1);
       String genericQueueName = "genericQueue";
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/selector/SelectorTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/selector/SelectorTest.java
index 80f0ced630..21bc70453e 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/selector/SelectorTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/selector/SelectorTest.java
@@ -33,6 +33,7 @@ import org.apache.activemq.artemis.jms.tests.ActiveMQServerTestCase;
 import org.apache.activemq.artemis.jms.tests.util.ProxyAssertSupport;
 import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
 import org.junit.Assert;
+import org.junit.Ignore;
 import org.junit.Test;
 
 import static org.junit.Assert.assertNotNull;
@@ -883,7 +884,9 @@ public class SelectorTest extends ActiveMQServerTestCase {
    // Test case proposed by a customer on this user forum:
    // http://community.jboss.org/thread/153426?tstart=0
    // This test needs to be moved away
-   public void disabled_testMultipleConsumers() throws Exception {
+   @Test
+   @Ignore
+   public void testMultipleConsumers() throws Exception {
       Connection conn = null;
 
       try {