diff --git a/activemq-core/src/test/java/org/apache/activemq/xbean/XBeanConfigTest.java b/activemq-core/src/test/java/org/apache/activemq/xbean/XBeanConfigTest.java
index 8cfd9e2556..78eae865a0 100644
--- a/activemq-core/src/test/java/org/apache/activemq/xbean/XBeanConfigTest.java
+++ b/activemq-core/src/test/java/org/apache/activemq/xbean/XBeanConfigTest.java
@@ -48,6 +48,8 @@ public class XBeanConfigTest extends TestCase {
 
     public void testBrokerConfiguredCorrectly() throws Exception {
 
+        // Validate the system properties are being evaluated in xbean.
+        assertEquals("testbroker", brokerService.getBrokerName());
 
         Topic topic = (Topic) broker.addDestination(context, new ActiveMQTopic("FOO.BAR"));
         DispatchPolicy dispatchPolicy = topic.getDispatchPolicy();
@@ -77,6 +79,7 @@ public class XBeanConfigTest extends TestCase {
     }
 
     protected void setUp() throws Exception {
+        System.setProperty("brokername", "testbroker");
         brokerService = createBroker();
         broker = brokerService.getBroker();