diff --git a/docs/src/reference/docbook/reference/bootstrap.xml b/docs/src/reference/docbook/reference/bootstrap.xml
index 8f3dc6bd..426ea18a 100644
--- a/docs/src/reference/docbook/reference/bootstrap.xml
+++ b/docs/src/reference/docbook/reference/bootstrap.xml
@@ -78,7 +78,7 @@
     <programlisting language="xml">&lt;?xml version="1.0" encoding="UTF-8"?&gt;
 &lt;beans xmlns="http://www.springframework.org/schema/beans"
   xmlxsi="http://www.w3.org/2001/XMLSchema-instance" 
-  xml<co id="gfe#ns#prefix"/>gfe="http://www.springframework.org/schema/gemfire"<co
+  xmlns:<co id="gfe#ns#prefix"/>gfe="http://www.springframework.org/schema/gemfire"<co
         id="gfe#ns#uri"/>
   xsi:schemaLocation="
         http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
@@ -127,12 +127,13 @@
       <programlisting language="xml">&lt;?xml version="1.0" encoding="UTF-8"?&gt;
 &lt;beans xmlns="<co id="gfe#default-ns#prefix"/>http://www.springframework.org/schema/gemfire"
     xmlxsi="http://www.w3.org/2001/XMLSchema-instance"
- xml<co id="gfe#default-ns#beans-prefix"/>beans="http://www.springframework.org/schema/beans"
+ <co id="gfe#default-ns#beans-prefix"/>
+ xmlns:beans="http://www.springframework.org/schema/beans"
  xsi:schemaLocation="
      http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
      http://www.springframework.org/schema/gemfire http://www.springframework.org/schema/gemfire/spring-gemfire.xsd"&gt;
      
-    <co id="gfe#default-ns#beans-example"/>&lt;beabean id ... &gt;
+    <co id="gfe#default-ns#beans-example"/>&lt;beans:bean id ... &gt;
  
     <co id="gfe#default-ns#gfe-example"/>&lt;cache ...&gt;
 
diff --git a/src/test/java/org/springframework/data/gemfire/support/ClientCacheManagerTest.java b/src/test/java/org/springframework/data/gemfire/support/ClientCacheManagerTest.java
new file mode 100644
index 00000000..f9b8edbb
--- /dev/null
+++ b/src/test/java/org/springframework/data/gemfire/support/ClientCacheManagerTest.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2002-2013 the original author or authors.
+ *
+ * Licensed 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.springframework.data.gemfire.support;
+
+import static org.junit.Assert.*;
+
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.gemfire.ForkUtil;
+import org.springframework.data.gemfire.fork.SpringCacheServerProcess;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+/**
+ * @author David Turanski
+ *
+ */
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration("/org/springframework/data/gemfire/support/cache-manager-client-cache.xml")
+public class ClientCacheManagerTest {
+	@Autowired 
+	GemfireCacheManager cacheManager;
+	@BeforeClass
+	public static void startUp() throws Exception {
+		ForkUtil.startCacheServer(SpringCacheServerProcess.class.getName() + " "
+				+ "/org/springframework/data/gemfire/client/datasource-server.xml");
+	}
+	@Test
+	public void test() {
+		assertNotNull(cacheManager.getCache("r1"));
+	}
+	@AfterClass
+	public static void cleanUp() {
+		ForkUtil.sendSignal();
+	}
+}
diff --git a/src/test/resources/org/springframework/data/gemfire/support/cache-manager-client-cache.xml b/src/test/resources/org/springframework/data/gemfire/support/cache-manager-client-cache.xml
new file mode 100644
index 00000000..a783edfd
--- /dev/null
+++ b/src/test/resources/org/springframework/data/gemfire/support/cache-manager-client-cache.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:gfe="http://www.springframework.org/schema/gemfire"
+	xsi:schemaLocation="http://www.springframework.org/schema/gemfire http://www.springframework.org/schema/gemfire/spring-gemfire.xsd
+		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+
+	<gfe:client-cache />
+	<gfe:pool>
+		<gfe:server host="localhost" port="40404"/>
+	</gfe:pool>
+	<gfe:client-region id="r1"/>
+	<bean class="org.springframework.data.gemfire.support.GemfireCacheManager">
+		<property name="cache" ref="gemfireCache"/>
+	</bean>
+</beans>
\ No newline at end of file