diff --git a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/AmqpConnectTimeoutTest.java b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/AmqpConnectTimeoutTest.java
index 7110a25447f..e4748978924 100644
--- a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/AmqpConnectTimeoutTest.java
+++ b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/AmqpConnectTimeoutTest.java
@@ -126,7 +126,7 @@ public void run() {
         assertTrue("one connection", Wait.waitFor(new Wait.Condition() {
              @Override
              public boolean isSatisified() throws Exception {
-                 return 1 == brokerService.getTransportConnectorByScheme(getConnectorScheme()).connectionCount();
+                 return 1 == brokerService.getTransportConnectorByScheme(getConnectorScheme()).getConnectionCount();
              }
         }, TimeUnit.SECONDS.toMillis(15), TimeUnit.MILLISECONDS.toMillis(250)));
 
@@ -134,7 +134,7 @@ public boolean isSatisified() throws Exception {
         assertTrue("no dangling connections", Wait.waitFor(new Wait.Condition() {
             @Override
             public boolean isSatisified() throws Exception {
-                return 0 == brokerService.getTransportConnectorByScheme(getConnectorScheme()).connectionCount();
+                return 0 == brokerService.getTransportConnectorByScheme(getConnectorScheme()).getConnectionCount();
             }
         }, TimeUnit.SECONDS.toMillis(15), TimeUnit.MILLISECONDS.toMillis(500)));
 
diff --git a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/JMSClientTest.java b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/JMSClientTest.java
index 4b6e4aa63e7..31928c43825 100644
--- a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/JMSClientTest.java
+++ b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/JMSClientTest.java
@@ -815,7 +815,7 @@ public void testConnectionsAreClosed() throws Exception {
         ActiveMQAdmin.enableJMSFrameTracing();
 
         final ConnectorViewMBean connector = getProxyToConnectionView(getTargetConnectorName());
-        LOG.info("Current number of Connections is: {}", connector.connectionCount());
+        LOG.info("Current number of Connections is: {}", connector.getConnectionCount());
 
         ArrayList<Connection> connections = new ArrayList<>();
 
@@ -823,7 +823,7 @@ public void testConnectionsAreClosed() throws Exception {
             connections.add(createConnection(null));
         }
 
-        LOG.info("Current number of Connections is: {}", connector.connectionCount());
+        LOG.info("Current number of Connections is: {}", connector.getConnectionCount());
 
         for (Connection connection : connections) {
             connection.close();
@@ -833,8 +833,8 @@ public void testConnectionsAreClosed() throws Exception {
 
             @Override
             public boolean isSatisified() throws Exception {
-                LOG.info("Current number of Connections is: {}", connector.connectionCount());
-                return connector.connectionCount() == 0;
+                LOG.info("Current number of Connections is: {}", connector.getConnectionCount());
+                return connector.getConnectionCount() == 0;
             }
         }));
     }
diff --git a/activemq-http/src/test/java/org/apache/activemq/transport/ws/MQTTWSConnectionTimeoutTest.java b/activemq-http/src/test/java/org/apache/activemq/transport/ws/MQTTWSConnectionTimeoutTest.java
index a03fdd0dff7..9a7f03b409b 100644
--- a/activemq-http/src/test/java/org/apache/activemq/transport/ws/MQTTWSConnectionTimeoutTest.java
+++ b/activemq-http/src/test/java/org/apache/activemq/transport/ws/MQTTWSConnectionTimeoutTest.java
@@ -64,7 +64,7 @@ public void testInactivityMonitor() throws Exception {
         assertTrue("one connection", Wait.waitFor(new Wait.Condition() {
              @Override
              public boolean isSatisified() throws Exception {
-                 return 1 == broker.getTransportConnectorByScheme(getConnectorScheme()).connectionCount();
+                 return 1 == broker.getTransportConnectorByScheme(getConnectorScheme()).getConnectionCount();
              }
         }, TimeUnit.SECONDS.toMillis(15), TimeUnit.MILLISECONDS.toMillis(250)));
 
@@ -72,7 +72,7 @@ public boolean isSatisified() throws Exception {
         assertTrue("no dangling connections", Wait.waitFor(new Wait.Condition() {
             @Override
             public boolean isSatisified() throws Exception {
-                return 0 == broker.getTransportConnectorByScheme(getConnectorScheme()).connectionCount();
+                return 0 == broker.getTransportConnectorByScheme(getConnectorScheme()).getConnectionCount();
             }
         }, TimeUnit.SECONDS.toMillis(60), TimeUnit.MILLISECONDS.toMillis(500)));
 
diff --git a/activemq-http/src/test/java/org/apache/activemq/transport/ws/StompWSConnectionTimeoutTest.java b/activemq-http/src/test/java/org/apache/activemq/transport/ws/StompWSConnectionTimeoutTest.java
index 4530de9a6c5..87e422e4190 100644
--- a/activemq-http/src/test/java/org/apache/activemq/transport/ws/StompWSConnectionTimeoutTest.java
+++ b/activemq-http/src/test/java/org/apache/activemq/transport/ws/StompWSConnectionTimeoutTest.java
@@ -66,7 +66,7 @@ public void testInactivityMonitor() throws Exception {
         assertTrue("one connection", Wait.waitFor(new Wait.Condition() {
              @Override
              public boolean isSatisified() throws Exception {
-                 return 1 == broker.getTransportConnectorByScheme(getConnectorScheme()).connectionCount();
+                 return 1 == broker.getTransportConnectorByScheme(getConnectorScheme()).getConnectionCount();
              }
         }, TimeUnit.SECONDS.toMillis(15), TimeUnit.MILLISECONDS.toMillis(250)));
 
@@ -74,7 +74,7 @@ public boolean isSatisified() throws Exception {
         assertTrue("no dangling connections", Wait.waitFor(new Wait.Condition() {
             @Override
             public boolean isSatisified() throws Exception {
-                return 0 == broker.getTransportConnectorByScheme(getConnectorScheme()).connectionCount();
+                return 0 == broker.getTransportConnectorByScheme(getConnectorScheme()).getConnectionCount();
             }
         }, TimeUnit.SECONDS.toMillis(60), TimeUnit.MILLISECONDS.toMillis(500)));
 
diff --git a/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/MQTTConnectTest.java b/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/MQTTConnectTest.java
index f3e89af8ddd..ec5d6317f58 100644
--- a/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/MQTTConnectTest.java
+++ b/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/MQTTConnectTest.java
@@ -140,7 +140,7 @@ public void run() {
         assertTrue("one connection", Wait.waitFor(new Wait.Condition() {
              @Override
              public boolean isSatisified() throws Exception {
-                 return 1 == brokerService.getTransportConnectors().get(0).connectionCount();
+                 return 1 == brokerService.getTransportConnectors().get(0).getConnectionCount();
              }
          }, TimeUnit.SECONDS.toMillis(30), TimeUnit.MILLISECONDS.toMillis(100)));
 
@@ -148,7 +148,7 @@ public boolean isSatisified() throws Exception {
         assertTrue("no dangling connections", Wait.waitFor(new Wait.Condition() {
             @Override
             public boolean isSatisified() throws Exception {
-                return 0 == brokerService.getTransportConnectors().get(0).connectionCount();
+                return 0 == brokerService.getTransportConnectors().get(0).getConnectionCount();
             }
         }, TimeUnit.SECONDS.toMillis(30), TimeUnit.MILLISECONDS.toMillis(100)));
 
diff --git a/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/ConnectTest.java b/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/ConnectTest.java
index 1e5441b54d8..b357052aac6 100644
--- a/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/ConnectTest.java
+++ b/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/ConnectTest.java
@@ -84,7 +84,7 @@ public void testStompConnectLeak() throws Exception {
         assertTrue("no dangling connections", Wait.waitFor(new Wait.Condition() {
             @Override
             public boolean isSatisified() throws Exception {
-                return 0 == brokerService.getTransportConnectors().get(0).connectionCount();
+                return 0 == brokerService.getTransportConnectors().get(0).getConnectionCount();
             }
         }, TimeUnit.SECONDS.toMillis(15), TimeUnit.MILLISECONDS.toMillis(200)));
 
@@ -121,7 +121,7 @@ public void run() {
         assertTrue("one connection", Wait.waitFor(new Wait.Condition() {
             @Override
             public boolean isSatisified() throws Exception {
-                return 1 == brokerService.getTransportConnectors().get(0).connectionCount();
+                return 1 == brokerService.getTransportConnectors().get(0).getConnectionCount();
             }
         }, TimeUnit.SECONDS.toMillis(15), TimeUnit.MILLISECONDS.toMillis(200)));
 
@@ -164,7 +164,7 @@ public void run() {
         assertTrue("one connection", Wait.waitFor(new Wait.Condition() {
              @Override
              public boolean isSatisified() throws Exception {
-                 return 1 == brokerService.getTransportConnectors().get(0).connectionCount();
+                 return 1 == brokerService.getTransportConnectors().get(0).getConnectionCount();
              }
          }, TimeUnit.SECONDS.toMillis(15), TimeUnit.MILLISECONDS.toMillis(200)));
 
@@ -172,7 +172,7 @@ public boolean isSatisified() throws Exception {
         assertTrue("no dangling connections", Wait.waitFor(new Wait.Condition() {
             @Override
             public boolean isSatisified() throws Exception {
-                return 0 == brokerService.getTransportConnectors().get(0).connectionCount();
+                return 0 == brokerService.getTransportConnectors().get(0).getConnectionCount();
             }
         }, TimeUnit.SECONDS.toMillis(15), TimeUnit.MILLISECONDS.toMillis(200)));
 
diff --git a/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/StompConnectTimeoutTest.java b/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/StompConnectTimeoutTest.java
index d88bbafe22c..10cf1502375 100644
--- a/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/StompConnectTimeoutTest.java
+++ b/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/StompConnectTimeoutTest.java
@@ -106,7 +106,7 @@ public void run() {
         assertTrue("one connection", Wait.waitFor(new Wait.Condition() {
              @Override
              public boolean isSatisified() throws Exception {
-                 return 1 == brokerService.getTransportConnectorByScheme(getConnectorScheme()).connectionCount();
+                 return 1 == brokerService.getTransportConnectorByScheme(getConnectorScheme()).getConnectionCount();
              }
         }, TimeUnit.SECONDS.toMillis(15), TimeUnit.MILLISECONDS.toMillis(250)));
 
@@ -114,7 +114,7 @@ public boolean isSatisified() throws Exception {
         assertTrue("no dangling connections", Wait.waitFor(new Wait.Condition() {
             @Override
             public boolean isSatisified() throws Exception {
-                return 0 == brokerService.getTransportConnectorByScheme(getConnectorScheme()).connectionCount();
+                return 0 == brokerService.getTransportConnectorByScheme(getConnectorScheme()).getConnectionCount();
             }
         }, TimeUnit.SECONDS.toMillis(15), TimeUnit.MILLISECONDS.toMillis(500)));