diff --git a/activemq-core/src/test/java/org/apache/activemq/thread/PooledTaskRunnerTest.java b/activemq-client/src/test/java/org/apache/activemq/thread/PooledTaskRunnerTest.java
similarity index 100%
rename from activemq-core/src/test/java/org/apache/activemq/thread/PooledTaskRunnerTest.java
rename to activemq-client/src/test/java/org/apache/activemq/thread/PooledTaskRunnerTest.java
diff --git a/activemq-core/src/test/java/org/apache/activemq/thread/TaskRunnerTest.java b/activemq-client/src/test/java/org/apache/activemq/thread/TaskRunnerTest.java
similarity index 100%
rename from activemq-core/src/test/java/org/apache/activemq/thread/TaskRunnerTest.java
rename to activemq-client/src/test/java/org/apache/activemq/thread/TaskRunnerTest.java
diff --git a/activemq-core/src/test/java/org/apache/activemq/util/IntrospectionSupportTest.java b/activemq-client/src/test/java/org/apache/activemq/util/IntrospectionSupportTest.java
similarity index 100%
rename from activemq-core/src/test/java/org/apache/activemq/util/IntrospectionSupportTest.java
rename to activemq-client/src/test/java/org/apache/activemq/util/IntrospectionSupportTest.java
diff --git a/activemq-core/src/test/java/org/apache/activemq/util/MarshallingSupportTest.java b/activemq-client/src/test/java/org/apache/activemq/util/MarshallingSupportTest.java
similarity index 100%
rename from activemq-core/src/test/java/org/apache/activemq/util/MarshallingSupportTest.java
rename to activemq-client/src/test/java/org/apache/activemq/util/MarshallingSupportTest.java
diff --git a/activemq-core/src/test/java/org/apache/activemq/util/StopWatchTest.java b/activemq-client/src/test/java/org/apache/activemq/util/StopWatchTest.java
similarity index 100%
rename from activemq-core/src/test/java/org/apache/activemq/util/StopWatchTest.java
rename to activemq-client/src/test/java/org/apache/activemq/util/StopWatchTest.java
diff --git a/activemq-core/src/test/java/org/apache/activemq/util/URISupportTest.java b/activemq-client/src/test/java/org/apache/activemq/util/URISupportTest.java
similarity index 100%
rename from activemq-core/src/test/java/org/apache/activemq/util/URISupportTest.java
rename to activemq-client/src/test/java/org/apache/activemq/util/URISupportTest.java