diff --git a/tests/activemq5-unit-tests/src/main/java/org/apache/activemq/broker/BrokerService.java b/tests/activemq5-unit-tests/src/main/java/org/apache/activemq/broker/BrokerService.java
index 19f3b099c2..34dc6e4757 100644
--- a/tests/activemq5-unit-tests/src/main/java/org/apache/activemq/broker/BrokerService.java
+++ b/tests/activemq5-unit-tests/src/main/java/org/apache/activemq/broker/BrokerService.java
@@ -208,9 +208,6 @@ public class BrokerService implements Service
    // Properties
    // -------------------------------------------------------------------------
 
-   /**
-    * Returns the message broker
-    */
    public Broker getBroker() throws Exception
    {
       if (broker == null)
@@ -225,11 +222,6 @@ public class BrokerService implements Service
       return brokerName;
    }
 
-   /**
-    * Sets the name of this broker; which must be unique in the network
-    *
-    * @param brokerName
-    */
    public void setBrokerName(String brokerName)
    {
       if (brokerName == null)
@@ -244,11 +236,6 @@ public class BrokerService implements Service
       this.brokerName = str.trim();
    }
 
-   /**
-    * Factory method to create a new broker
-    *
-    * @throws Exception
-    */
    protected Broker createBroker() throws Exception
    {
       broker = createBrokerWrapper();
diff --git a/tests/activemq5-unit-tests/src/main/java/org/apache/activemq/broker/region/policy/PolicyMap.java b/tests/activemq5-unit-tests/src/main/java/org/apache/activemq/broker/region/policy/PolicyMap.java
index e48f2d906c..58aa694da9 100644
--- a/tests/activemq5-unit-tests/src/main/java/org/apache/activemq/broker/region/policy/PolicyMap.java
+++ b/tests/activemq5-unit-tests/src/main/java/org/apache/activemq/broker/region/policy/PolicyMap.java
@@ -23,13 +23,6 @@ import org.apache.activemq.command.ActiveMQDestination;
 import org.apache.activemq.filter.DestinationMap;
 import org.apache.activemq.filter.DestinationMapEntry;
 
-/**
- * Represents a destination based configuration of policies so that individual
- * destinations or wildcard hierarchies of destinations can be configured using
- * different policies.
- *
- * @org.apache.xbean.XBean
- */
 public class PolicyMap extends DestinationMap
 {
 
@@ -46,11 +39,6 @@ public class PolicyMap extends DestinationMap
       return answer;
    }
 
-   /**
-    * Sets the individual entries on the policy map
-    *
-    * @org.apache.xbean.ElementType class="org.apache.activemq.broker.region.policy.PolicyEntry"
-    */
    public void setPolicyEntries(List entries)
    {
       super.setEntries(entries);