diff --git a/spring-rabbit-json/src/main/java/org/springframework/amqp/samples/json/Application.java b/spring-rabbit-json/src/main/java/org/springframework/amqp/samples/json/Application.java
index 52d8e14..b1a3b2a 100644
--- a/spring-rabbit-json/src/main/java/org/springframework/amqp/samples/json/Application.java
+++ b/spring-rabbit-json/src/main/java/org/springframework/amqp/samples/json/Application.java
@@ -116,15 +116,20 @@ public class Application {
 
 		});
 		Jackson2JsonMessageConverter jsonConverter = new Jackson2JsonMessageConverter();
+		jsonConverter.setClassMapper(classMapper());
+		messageListener.setMessageConverter(jsonConverter);
+		container.setMessageListener(messageListener);
+		return container;
+	}
+
+	@Bean
+	public DefaultClassMapper classMapper() {
 		DefaultClassMapper classMapper = new DefaultClassMapper();
 		Map<String, Class<?>> idClassMapping = new HashMap<>();
 		idClassMapping.put("foo", Foo.class);
 		idClassMapping.put("bar", Bar.class);
 		classMapper.setIdClassMapping(idClassMapping);
-		jsonConverter.setClassMapper(classMapper);
-		messageListener.setMessageConverter(jsonConverter);
-		container.setMessageListener(messageListener);
-		return container;
+		return classMapper;
 	}
 
 	@Bean