diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/PagingTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/PagingTest.java
index 01bb0911f0..56369c830a 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/PagingTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/PagingTest.java
@@ -5239,7 +5239,7 @@ public class PagingTest extends ServiceTestBase
          // allow time for the logging to actually happen on the server
          Thread.sleep(100);
 
-         Assert.assertTrue("Expected to find HQ224016", AssertionLoggerHandler.findText("HQ224016"));
+         Assert.assertTrue("Expected to find AMQ224016", AssertionLoggerHandler.findText("AMQ224016"));
 
          ClientConsumer consumer = session.createConsumer(ADDRESS);
 
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/JMSServerControl2Test.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/JMSServerControl2Test.java
index fb5d3f541f..4ca8615fae 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/JMSServerControl2Test.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/JMSServerControl2Test.java
@@ -543,7 +543,7 @@ public class JMSServerControl2Test extends ManagementTestBase
 
          spec.setPassword("password");
 
-         spec.setDestinationType("Queue");
+         spec.setDestinationType("javax.jms.Queue");
          spec.setDestination("test");
 
          spec.setMinSession(1);
@@ -632,7 +632,7 @@ public class JMSServerControl2Test extends ManagementTestBase
          spec.setUser("user");
          spec.setPassword("password");
 
-         spec.setDestinationType("Queue");
+         spec.setDestinationType("javax.jms.Queue");
          spec.setDestination("test");
 
          spec.setMinSession(1);
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/ra/ResourceAdapterTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/ra/ResourceAdapterTest.java
index 6e0ef08347..9387ab571e 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/ra/ResourceAdapterTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/ra/ResourceAdapterTest.java
@@ -86,7 +86,7 @@ public class ResourceAdapterTest extends ActiveMQRATestBase
       spec.setUser("user");
       spec.setPassword("password");
 
-      spec.setDestinationType("Topic");
+      spec.setDestinationType("javax.jms.Topic");
       spec.setDestination("test");
 
       spec.setMinSession(1);
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/ExtraStompTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/ExtraStompTest.java
index f2533a8f5d..6b427e2729 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/ExtraStompTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/ExtraStompTest.java
@@ -740,7 +740,7 @@ public class ExtraStompTest extends StompTestBase
          while (enu.hasMoreElements())
          {
             Message msg = (Message) enu.nextElement();
-            String msgId = msg.getStringProperty("amqMessageId");
+            String msgId = msg.getStringProperty("hqMessageId");
             if (enable != null && enable.booleanValue())
             {
                assertNotNull(msgId);