diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagementContext.java b/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagementContext.java
index de9edc6b7d..c2df360c29 100644
--- a/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagementContext.java
+++ b/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagementContext.java
@@ -145,6 +145,14 @@ public class ManagementContext implements Service {
         }
         return beanServer;
     }
+    
+    /**
+     * Set the MBeanServer
+     * @param beanServer
+     */
+    public void setMBeanServer(MBeanServer beanServer){
+        this.beanServer = beanServer;
+    }
 
     /**
      * @return Returns the useMBeanServer.