diff --git a/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/core/RabbitTemplate.java b/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/core/RabbitTemplate.java
index de58fb84..5912a8ba 100644
--- a/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/core/RabbitTemplate.java
+++ b/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/core/RabbitTemplate.java
@@ -299,7 +299,11 @@ public class RabbitTemplate extends RabbitAccessor implements RabbitOperations {
 			if (isChannelLocallyTransacted(channel)) {
 				resourceHolder.rollbackAll();
 			}
-			throw convertRabbitAccessException(ex);
+			if (ex instanceof RuntimeException) {
+				throw (RuntimeException) ex;
+			} else {
+				throw convertRabbitAccessException(ex);
+			}
 		} finally {
 			ConnectionFactoryUtils.releaseResources(resourceHolder);
 		}
diff --git a/spring-rabbit/src/test/java/org/springframework/amqp/rabbit/core/RabbitTemplateIntegrationTests.java b/spring-rabbit/src/test/java/org/springframework/amqp/rabbit/core/RabbitTemplateIntegrationTests.java
index fce0b74b..138effcd 100644
--- a/spring-rabbit/src/test/java/org/springframework/amqp/rabbit/core/RabbitTemplateIntegrationTests.java
+++ b/spring-rabbit/src/test/java/org/springframework/amqp/rabbit/core/RabbitTemplateIntegrationTests.java
@@ -26,7 +26,6 @@ import java.util.concurrent.TimeUnit;
 
 import org.junit.Rule;
 import org.junit.Test;
-import org.springframework.amqp.UncategorizedAmqpException;
 import org.springframework.amqp.core.Message;
 import org.springframework.amqp.core.MessageProperties;
 import org.springframework.amqp.rabbit.connection.CachingConnectionFactory;
@@ -106,9 +105,8 @@ public class RabbitTemplateIntegrationTests {
 				}
 			});
 			fail("Expected PlannedException");
-		} catch (UncategorizedAmqpException e) {
-			// TODO: allow client exception to propagate if no AMQP related
-			assertTrue(e.getCause() instanceof PlannedException);
+		} catch (Exception e) {
+			assertTrue(e instanceof PlannedException);
 		}
 		String result = (String) template.receiveAndConvert(ROUTE);
 		assertEquals("message", result);