diff --git a/spring-integration-amqp/pom.xml b/spring-integration-amqp/pom.xml
index 8cf14fc2cf..23f7a44b4b 100644
--- a/spring-integration-amqp/pom.xml
+++ b/spring-integration-amqp/pom.xml
@@ -150,18 +150,18 @@
       <version>1.2.12</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.springframework.integration</groupId>
+      <artifactId>spring-integration-test</artifactId>
+      <version>2.1.0.BUILD-SNAPSHOT</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.easymock</groupId>
       <artifactId>easymock</artifactId>
       <version>2.3</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.springframework.integration</groupId>
-      <artifactId>spring-integration-core</artifactId>
-      <version>2.1.0.BUILD-SNAPSHOT</version>
-      <scope>compile</scope>
-    </dependency>
     <dependency>
       <groupId>org.easymock</groupId>
       <artifactId>easymockclassextension</artifactId>
@@ -198,6 +198,12 @@
       <version>3.1.0.M2</version>
       <scope>compile</scope>
     </dependency>
+    <dependency>
+      <groupId>org.springframework.integration</groupId>
+      <artifactId>spring-integration-core</artifactId>
+      <version>2.1.0.BUILD-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit-dep</artifactId>
diff --git a/spring-integration-amqp/src/main/resources/META-INF/spring.tooling b/spring-integration-amqp/src/main/resources/META-INF/spring.tooling
new file mode 100644
index 0000000000..0d3f0b185d
--- /dev/null
+++ b/spring-integration-amqp/src/main/resources/META-INF/spring.tooling
@@ -0,0 +1,4 @@
+# Tooling related information for the integration AMQP namespace
+http\://www.springframework.org/schema/integration/amqp@name=integration AMQP Namespace
+http\://www.springframework.org/schema/integration/amqp@prefix=int-amqp
+http\://www.springframework.org/schema/integration/amqp@icon=org/springframework/integration/amqp/config/spring-integration-amqp.gif
diff --git a/spring-integration-amqp/src/main/resources/org/springframework/integration/amqp/config/spring-integration-amqp.gif b/spring-integration-amqp/src/main/resources/org/springframework/integration/amqp/config/spring-integration-amqp.gif
new file mode 100644
index 0000000000..cdccbae245
Binary files /dev/null and b/spring-integration-amqp/src/main/resources/org/springframework/integration/amqp/config/spring-integration-amqp.gif differ