diff --git a/src/test/java/org/springframework/data/gemfire/config/CacheNamespaceTest.java b/src/test/java/org/springframework/data/gemfire/config/CacheNamespaceTest.java
new file mode 100644
index 00000000..323e5e2b
--- /dev/null
+++ b/src/test/java/org/springframework/data/gemfire/config/CacheNamespaceTest.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright 2010 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.config;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
+import java.lang.reflect.Field;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationContext;
+import org.springframework.core.io.Resource;
+import org.springframework.data.gemfire.CacheFactoryBean;
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+/**
+ * @author Costin Leau
+ */
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration("cache-ns.xml")
+@DirtiesContext
+public class CacheNamespaceTest {
+
+	@Autowired
+	private ApplicationContext context;
+
+	@Test
+	public void testBasicCache() throws Exception {
+		assertTrue(context.containsBean("cache"));
+		CacheFactoryBean cfb = (CacheFactoryBean) context.getBean("&cache");
+		assertNull(readField("cacheXml", cfb));
+		assertNull(readField("properties", cfb));
+	}
+
+	@Test
+	public void testNamedCache() throws Exception {
+		assertTrue(context.containsBean("cache-with-name"));
+		CacheFactoryBean cfb = (CacheFactoryBean) context.getBean("&cache-with-name");
+		assertNull(readField("cacheXml", cfb));
+		assertNull(readField("properties", cfb));
+	}
+
+	@Test
+	public void testCacheWithXml() throws Exception {
+		assertTrue(context.containsBean("cache-with-xml"));
+		CacheFactoryBean cfb = (CacheFactoryBean) context.getBean("&cache-with-xml");
+		Resource res = (Resource) readField("cacheXml", cfb);
+		assertEquals("cache.xml", res.getFilename());
+		assertEquals(context.getBean("props"), readField("properties", cfb));
+	}
+
+	private Object readField(String name, Object target) throws Exception {
+		Field field = target.getClass().getDeclaredField(name);
+		field.setAccessible(true);
+		return field.get(target);
+	}
+}
diff --git a/src/test/resources/org/springframework/data/gemfire/config/cache-ns.xml b/src/test/resources/org/springframework/data/gemfire/config/cache-ns.xml
new file mode 100644
index 00000000..c3e03f48
--- /dev/null
+++ b/src/test/resources/org/springframework/data/gemfire/config/cache-ns.xml
@@ -0,0 +1,24 @@
+<?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"
+	xmlns:p="http://www.springframework.org/schema/p"
+	default-lazy-init="true"
+	xmlns:util="http://www.springframework.org/schema/util"
+	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
+		http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd">
+
+	<!-- all beans are lazy to allow the same config to be used between multiple tests -->
+	<!-- as there can be only one cache per VM -->
+	
+	<gfe:cache />
+	
+	<gfe:cache id="cache-with-name"/>
+	
+	<gfe:cache id="cache-with-xml" cache-xml-location="classpath:cache.xml" properties-ref="props"/>
+	
+	<util:properties id="props">
+		<prop key="disable-tcp">false</prop>
+	</util:properties>
+</beans>
\ No newline at end of file