diff --git a/activemq-commons/src/main/java/org/apache/activemq/utils/ActiveMQUtilBundle.java b/activemq-commons/src/main/java/org/apache/activemq/logs/ActiveMQUtilBundle.java
similarity index 98%
rename from activemq-commons/src/main/java/org/apache/activemq/utils/ActiveMQUtilBundle.java
rename to activemq-commons/src/main/java/org/apache/activemq/logs/ActiveMQUtilBundle.java
index 07298d3823..3af61df0e8 100644
--- a/activemq-commons/src/main/java/org/apache/activemq/utils/ActiveMQUtilBundle.java
+++ b/activemq-commons/src/main/java/org/apache/activemq/logs/ActiveMQUtilBundle.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.utils;
+package org.apache.activemq.logs;
 
 
 import org.apache.activemq.api.core.ActiveMQIllegalStateException;
diff --git a/activemq-commons/src/main/java/org/apache/activemq/utils/ActiveMQUtilLogger.java b/activemq-commons/src/main/java/org/apache/activemq/logs/ActiveMQUtilLogger.java
similarity index 98%
rename from activemq-commons/src/main/java/org/apache/activemq/utils/ActiveMQUtilLogger.java
rename to activemq-commons/src/main/java/org/apache/activemq/logs/ActiveMQUtilLogger.java
index 23657f57aa..92710fca41 100644
--- a/activemq-commons/src/main/java/org/apache/activemq/utils/ActiveMQUtilLogger.java
+++ b/activemq-commons/src/main/java/org/apache/activemq/logs/ActiveMQUtilLogger.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.utils;
+package org.apache.activemq.logs;
 
 import org.jboss.logging.BasicLogger;
 import org.jboss.logging.Logger;
diff --git a/activemq-commons/src/main/java/org/apache/activemq/utils/AssertionLoggerHandler.java b/activemq-commons/src/main/java/org/apache/activemq/logs/AssertionLoggerHandler.java
similarity index 99%
rename from activemq-commons/src/main/java/org/apache/activemq/utils/AssertionLoggerHandler.java
rename to activemq-commons/src/main/java/org/apache/activemq/logs/AssertionLoggerHandler.java
index 109617cf47..40a929509c 100644
--- a/activemq-commons/src/main/java/org/apache/activemq/utils/AssertionLoggerHandler.java
+++ b/activemq-commons/src/main/java/org/apache/activemq/logs/AssertionLoggerHandler.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.utils;
+package org.apache.activemq.logs;
 
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
diff --git a/activemq-commons/src/main/java/org/apache/activemq/utils/PasswordMaskingUtil.java b/activemq-commons/src/main/java/org/apache/activemq/utils/PasswordMaskingUtil.java
index 623d826f79..81753d48f3 100644
--- a/activemq-commons/src/main/java/org/apache/activemq/utils/PasswordMaskingUtil.java
+++ b/activemq-commons/src/main/java/org/apache/activemq/utils/PasswordMaskingUtil.java
@@ -23,6 +23,7 @@ import java.util.Map;
 
 import org.apache.activemq.api.core.ActiveMQException;
 import org.apache.activemq.api.core.ActiveMQExceptionType;
+import org.apache.activemq.logs.ActiveMQUtilBundle;
 
 /**
  * A PasswordMarkingUtil
diff --git a/activemq-commons/src/main/java/org/apache/activemq/utils/TypedProperties.java b/activemq-commons/src/main/java/org/apache/activemq/utils/TypedProperties.java
index 2f111aed55..e0eaf0e5d6 100644
--- a/activemq-commons/src/main/java/org/apache/activemq/utils/TypedProperties.java
+++ b/activemq-commons/src/main/java/org/apache/activemq/utils/TypedProperties.java
@@ -27,6 +27,7 @@ import java.util.Set;
 import org.apache.activemq.api.core.ActiveMQBuffer;
 import org.apache.activemq.api.core.ActiveMQPropertyConversionException;
 import org.apache.activemq.api.core.SimpleString;
+import org.apache.activemq.logs.ActiveMQUtilBundle;
 
 import static org.apache.activemq.utils.DataConstants.BOOLEAN;
 import static org.apache.activemq.utils.DataConstants.BYTE;
diff --git a/activemq-commons/src/main/java/org/apache/activemq/utils/UTF8Util.java b/activemq-commons/src/main/java/org/apache/activemq/utils/UTF8Util.java
index 58b9aa580f..0d02bd17c0 100644
--- a/activemq-commons/src/main/java/org/apache/activemq/utils/UTF8Util.java
+++ b/activemq-commons/src/main/java/org/apache/activemq/utils/UTF8Util.java
@@ -19,6 +19,8 @@ package org.apache.activemq.utils;
 import java.lang.ref.SoftReference;
 
 import org.apache.activemq.api.core.ActiveMQBuffer;
+import org.apache.activemq.logs.ActiveMQUtilBundle;
+import org.apache.activemq.logs.ActiveMQUtilLogger;
 
 /**
  *
diff --git a/activemq-commons/src/main/java/org/apache/activemq/utils/UUIDGenerator.java b/activemq-commons/src/main/java/org/apache/activemq/utils/UUIDGenerator.java
index d0ecd6c306..cfcaa55add 100644
--- a/activemq-commons/src/main/java/org/apache/activemq/utils/UUIDGenerator.java
+++ b/activemq-commons/src/main/java/org/apache/activemq/utils/UUIDGenerator.java
@@ -33,6 +33,7 @@ import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 
 import org.apache.activemq.api.core.SimpleString;
+import org.apache.activemq.logs.ActiveMQUtilLogger;
 
 public final class UUIDGenerator
 {
diff --git a/activemq-server/src/test/java/org/apache/activemq/core/config/impl/WrongRoleFileConfigurationParserTest.java b/activemq-server/src/test/java/org/apache/activemq/core/config/impl/WrongRoleFileConfigurationParserTest.java
index b95ec5c4ad..da72479f4d 100644
--- a/activemq-server/src/test/java/org/apache/activemq/core/config/impl/WrongRoleFileConfigurationParserTest.java
+++ b/activemq-server/src/test/java/org/apache/activemq/core/config/impl/WrongRoleFileConfigurationParserTest.java
@@ -20,7 +20,7 @@ import java.io.ByteArrayInputStream;
 import java.nio.charset.StandardCharsets;
 
 import org.apache.activemq.core.deployers.impl.FileConfigurationParser;
-import org.apache.activemq.utils.AssertionLoggerHandler;
+import org.apache.activemq.logs.AssertionLoggerHandler;
 import org.apache.activemq.tests.util.UnitTestCase;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
diff --git a/activemq-server/src/test/resources/logging.properties b/activemq-server/src/test/resources/logging.properties
index 1ac02cc777..5c39986aa2 100644
--- a/activemq-server/src/test/resources/logging.properties
+++ b/activemq-server/src/test/resources/logging.properties
@@ -45,7 +45,7 @@ handler.FILE.formatter=PATTERN
 
 
 # Console handler configuration
-handler.TEST=org.apache.activemq.utils.AssertionLoggerHandler
+handler.TEST=org.apache.activemq.logs.AssertionLoggerHandler
 handler.TEST.level=TRACE
 handler.TEST.formatter=PATTERN
 
diff --git a/tests/config/logging.properties b/tests/config/logging.properties
index 3062239331..34052e3f4e 100644
--- a/tests/config/logging.properties
+++ b/tests/config/logging.properties
@@ -51,7 +51,7 @@ handler.FILE.fileName=target/activemq.log
 handler.FILE.formatter=PATTERN
 
 # Console handler configuration
-handler.TEST=org.apache.activemq.utils.AssertionLoggerHandler
+handler.TEST=org.apache.activemq.logs.AssertionLoggerHandler
 handler.TEST.level=TRACE
 handler.TEST.formatter=PATTERN
 
diff --git a/tests/config/logging.properties.trace b/tests/config/logging.properties.trace
index c6c948d802..e394e40d68 100644
--- a/tests/config/logging.properties.trace
+++ b/tests/config/logging.properties.trace
@@ -53,7 +53,7 @@ handler.FILE.fileName=target/activemq.log
 handler.FILE.formatter=PATTERN
 
 # Console handler configuration
-handler.TEST=org.apache.activemq.utils.AssertionLoggerHandler
+handler.TEST=org.apache.activemq.logs.AssertionLoggerHandler
 handler.TEST.level=TRACE
 handler.TEST.formatter=PATTERN
 
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 4e53b9189f..7a19f2897f 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
@@ -73,7 +73,7 @@ import org.apache.activemq.core.server.impl.ActiveMQServerImpl;
 import org.apache.activemq.core.settings.impl.AddressFullMessagePolicy;
 import org.apache.activemq.core.settings.impl.AddressSettings;
 import org.apache.activemq.tests.integration.IntegrationTestLogger;
-import org.apache.activemq.utils.AssertionLoggerHandler;
+import org.apache.activemq.logs.AssertionLoggerHandler;
 import org.apache.activemq.tests.util.ServiceTestBase;
 import org.apache.activemq.tests.util.UnitTestCase;
 import org.junit.Assert;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/server/AddressFullLoggingTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/server/AddressFullLoggingTest.java
index 7d73029cb0..9bea0fecc3 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/server/AddressFullLoggingTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/server/AddressFullLoggingTest.java
@@ -33,7 +33,7 @@ import org.apache.activemq.api.core.client.ServerLocator;
 import org.apache.activemq.core.server.ActiveMQServer;
 import org.apache.activemq.core.settings.impl.AddressFullMessagePolicy;
 import org.apache.activemq.core.settings.impl.AddressSettings;
-import org.apache.activemq.utils.AssertionLoggerHandler;
+import org.apache.activemq.logs.AssertionLoggerHandler;
 import org.apache.activemq.tests.util.ServiceTestBase;
 import org.junit.AfterClass;
 import org.junit.Assert;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/server/FileLockTimeoutTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/server/FileLockTimeoutTest.java
index 1f295d30a5..0e037e69ef 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/server/FileLockTimeoutTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/server/FileLockTimeoutTest.java
@@ -27,7 +27,7 @@ import org.apache.activemq.core.config.ha.SharedStoreMasterPolicyConfiguration;
 import org.apache.activemq.core.server.ActiveMQServer;
 import org.apache.activemq.core.server.JournalType;
 import org.apache.activemq.tests.integration.IntegrationTestLogger;
-import org.apache.activemq.utils.AssertionLoggerHandler;
+import org.apache.activemq.logs.AssertionLoggerHandler;
 import org.apache.activemq.tests.util.ServiceTestBase;
 import org.junit.AfterClass;
 import org.junit.Assert;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/server/SimpleStartStopTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/server/SimpleStartStopTest.java
index b5386c56c4..54326289ae 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/server/SimpleStartStopTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/server/SimpleStartStopTest.java
@@ -22,7 +22,7 @@ import java.util.concurrent.atomic.AtomicInteger;
 
 import org.apache.activemq.core.persistence.impl.journal.JournalRecordIds;
 import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.utils.AssertionLoggerHandler;
+import org.apache.activemq.logs.AssertionLoggerHandler;
 import org.apache.activemq.tests.util.ServiceTestBase;
 import org.jboss.logmanager.Level;
 import org.junit.Test;