diff --git a/activemq-core/src/test/java/org/apache/activemq/xbean/JDBCPersistenceAdapterXBeanConfigTest.java b/activemq-core/src/test/java/org/apache/activemq/xbean/JDBCPersistenceAdapterXBeanConfigTest.java
new file mode 100644
index 0000000000..100f244993
--- /dev/null
+++ b/activemq-core/src/test/java/org/apache/activemq/xbean/JDBCPersistenceAdapterXBeanConfigTest.java
@@ -0,0 +1,60 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.xbean;
+
+import java.net.URI;
+import junit.framework.TestCase;
+import org.apache.activemq.broker.BrokerFactory;
+import org.apache.activemq.broker.BrokerService;
+import org.apache.activemq.store.PersistenceAdapter;
+import org.apache.activemq.store.jdbc.JDBCPersistenceAdapter;
+
+/**
+ * 
+ */
+public class JDBCPersistenceAdapterXBeanConfigTest extends TestCase {
+
+    protected BrokerService brokerService;
+
+    public void testConfiguredCorrectly() throws Exception {
+
+        PersistenceAdapter persistenceAdapter = brokerService.getPersistenceAdapter();
+        assertNotNull(persistenceAdapter);
+        assertTrue(persistenceAdapter instanceof JDBCPersistenceAdapter);
+
+        JDBCPersistenceAdapter jpa = (JDBCPersistenceAdapter)persistenceAdapter;
+        assertEquals("BROKER1.", jpa.getStatements().getTablePrefix());
+
+    }
+
+    protected void setUp() throws Exception {
+        brokerService = createBroker();
+        brokerService.start();
+    }
+
+    protected void tearDown() throws Exception {
+        if (brokerService != null) {
+            brokerService.stop();
+        }
+    }
+
+    protected BrokerService createBroker() throws Exception {
+        String uri = "org/apache/activemq/xbean/jdbc-persistence-adapter-test.xml";
+        return BrokerFactory.createBroker(new URI("xbean:" + uri));
+    }
+
+}
diff --git a/activemq-core/src/test/java/org/apache/activemq/xbean/JDBCPersistenceXBeanConfigTest.java b/activemq-core/src/test/java/org/apache/activemq/xbean/JDBCPersistenceXBeanConfigTest.java
index b1b1701422..5a34932e12 100644
--- a/activemq-core/src/test/java/org/apache/activemq/xbean/JDBCPersistenceXBeanConfigTest.java
+++ b/activemq-core/src/test/java/org/apache/activemq/xbean/JDBCPersistenceXBeanConfigTest.java
@@ -32,7 +32,7 @@ public class JDBCPersistenceXBeanConfigTest extends TestCase {
 
     protected BrokerService brokerService;
 
-    public void testManagmentContextConfiguredCorrectly() throws Exception {
+    public void testConfiguredCorrectly() throws Exception {
 
         PersistenceAdapter persistenceAdapter = brokerService.getPersistenceAdapter();
         assertNotNull(persistenceAdapter);
diff --git a/activemq-core/src/test/resources/org/apache/activemq/xbean/jdbc-persistence-adapter-test.xml b/activemq-core/src/test/resources/org/apache/activemq/xbean/jdbc-persistence-adapter-test.xml
new file mode 100644
index 0000000000..e5f4f2624a
--- /dev/null
+++ b/activemq-core/src/test/resources/org/apache/activemq/xbean/jdbc-persistence-adapter-test.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+   
+    http://www.apache.org/licenses/LICENSE-2.0
+   
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+<!-- this file can only be parsed using the xbean-spring library -->
+<!-- START SNIPPET: xbean -->
+<beans 
+  xmlns="http://www.springframework.org/schema/beans" 
+  xmlns:amq="http://activemq.apache.org/schema/core"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd">
+
+  <broker useJmx="false" xmlns="http://activemq.apache.org/schema/core">
+
+    <persistenceAdapter>
+      <jdbcPersistenceAdapter>
+        <statements>
+          <statements tablePrefix="BROKER1."/>
+        </statements>
+        <adapter>
+           <defaultJDBCAdapter />
+         </adapter>
+      </jdbcPersistenceAdapter>
+    </persistenceAdapter>
+
+  </broker>
+
+</beans>
+<!-- END SNIPPET: xbean -->