diff --git a/src/test/java/org/springframework/data/gemfire/support/GemfirePersistenceExceptionTranslationTest.java b/src/test/java/org/springframework/data/gemfire/support/GemfirePersistenceExceptionTranslationTest.java
new file mode 100644
index 00000000..c8aea7b1
--- /dev/null
+++ b/src/test/java/org/springframework/data/gemfire/support/GemfirePersistenceExceptionTranslationTest.java
@@ -0,0 +1,85 @@
+/*
+ * Copyright 2012 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 java.util.Map;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.config.BeanPostProcessor;
+import org.springframework.context.ApplicationContext;
+import org.springframework.data.gemfire.GemfireQueryException;
+import org.springframework.stereotype.Repository;
+
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+import com.gemstone.gemfire.cache.query.FunctionDomainException;
+import com.gemstone.gemfire.cache.query.QueryException;
+import com.gemstone.gemfire.cache.query.QueryInvocationTargetException;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration
+public class GemfirePersistenceExceptionTranslationTest {
+	@Autowired 
+	GemFireRepo1 gemfireRepo1;
+	@Autowired
+	ApplicationContext ctx;
+	 
+	@Test
+	public void test() {
+		Map<String, BeanPostProcessor> bpps = ctx.getBeansOfType(BeanPostProcessor.class);
+		System.out.println(bpps.size());
+		for (BeanPostProcessor bpp: bpps.values()) {
+			System.out.println(bpp.getClass().getSimpleName());
+		}
+		try {
+			gemfireRepo1.doit(new QueryException());
+			fail("should throw a query exception");
+		} catch (GemfireQueryException e){
+			
+		}
+		
+		try {
+			gemfireRepo1.doit(new FunctionDomainException("test"));
+			fail("should throw a query exception");
+		} catch (GemfireQueryException e) {
+			 
+		}
+		
+		try {
+			gemfireRepo1.doit(new QueryInvocationTargetException("test"));
+			fail("should throw a query exception");
+		} catch (GemfireQueryException e) {
+			 
+		}
+	}
+	
+	/**
+	 * Wraps GemfireCheckedExceptions in RuntimeException 
+	 * @author David Turanski
+	 *
+	 */
+	@Repository 
+	public static class GemFireRepo1 {
+		public void doit(Exception e)  {
+			throw new RuntimeException(e);
+		}	 
+	}
+}
diff --git a/src/test/resources/org/springframework/data/gemfire/support/GemfirePersistenceExceptionTranslationTest-context.xml b/src/test/resources/org/springframework/data/gemfire/support/GemfirePersistenceExceptionTranslationTest-context.xml
new file mode 100644
index 00000000..f2b1e83e
--- /dev/null
+++ b/src/test/resources/org/springframework/data/gemfire/support/GemfirePersistenceExceptionTranslationTest-context.xml
@@ -0,0 +1,13 @@
+<?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:context="http://www.springframework.org/schema/context"
+	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/context http://www.springframework.org/schema/context/spring-context.xsd">
+	
+	<context:component-scan base-package="org.springframework.data.gemfire.support"/>
+	<gfe:cache/>
+	<bean class="org.springframework.dao.annotation.PersistenceExceptionTranslationPostProcessor"/>
+</beans>