diff --git a/repository/src/main/resources/alfresco/subsystems/Messaging/default/messaging-context.xml b/repository/src/main/resources/alfresco/subsystems/Messaging/default/messaging-context.xml
index 4468382a9e..7aeb272667 100644
--- a/repository/src/main/resources/alfresco/subsystems/Messaging/default/messaging-context.xml
+++ b/repository/src/main/resources/alfresco/subsystems/Messaging/default/messaging-context.xml
@@ -39,6 +39,10 @@
         <property name="configuration" ref="jmsConfig"/>
     </bean>
 
+    <bean id="activemq" class="org.apache.camel.component.activemq.ActiveMQComponent">
+        <property name="configuration" ref="jmsConfig"/>
+    </bean>
+
     <bean id="amqp" class="org.apache.camel.component.amqp.AMQPComponent">
         <property name="configuration" ref="jmsConfig"/>
     </bean>
diff --git a/repository/src/test/java/org/alfresco/messaging/camel/CamelComponentsTest.java b/repository/src/test/java/org/alfresco/messaging/camel/CamelComponentsTest.java
index 57a68c943c..c3cd0f2bba 100644
--- a/repository/src/test/java/org/alfresco/messaging/camel/CamelComponentsTest.java
+++ b/repository/src/test/java/org/alfresco/messaging/camel/CamelComponentsTest.java
@@ -48,12 +48,29 @@ public class CamelComponentsTest {
     @Autowired
     protected CamelContext camelContext;
 
+    @Produce("activemq:queue:alfresco.test")
+    protected ProducerTemplate activemqTemplate;
+
     @Produce("amqp:queue:alfresco.test")
     protected ProducerTemplate amqpTemplate;
 
     @Produce("jms:queue:alfresco.test")
     protected ProducerTemplate jmsTemplate;
 
+    @Test
+    public void testActivemqComponent()
+    {
+        final String msg = "ping <activemq>";
+
+        activemqTemplate.sendBody(msg);
+
+        final Object reply = camelContext
+                .createConsumerTemplate()
+                .receiveBody("activemq:queue:alfresco.test", 2000);
+
+        assertEquals(msg, reply);
+    }
+
     @Test
     public void testAmqpComponent()
     {