diff --git a/org.springframework.integration.http/src/test/java/org/springframework/integration/http/config/HttpInboundChannelAdapterParserTests-context.xml b/org.springframework.integration.http/src/test/java/org/springframework/integration/http/config/HttpInboundChannelAdapterParserTests-context.xml
new file mode 100644
index 0000000000..e553173c3d
--- /dev/null
+++ b/org.springframework.integration.http/src/test/java/org/springframework/integration/http/config/HttpInboundChannelAdapterParserTests-context.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans:beans xmlns="http://www.springframework.org/schema/integration/http"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:beans="http://www.springframework.org/schema/beans"
+	xmlns:si="http://www.springframework.org/schema/integration"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans
+			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/integration
+			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd
+			http://www.springframework.org/schema/integration/http
+			http://www.springframework.org/schema/integration/http/spring-integration-http-1.0.xsd">
+
+	<si:channel id="requests">
+		<si:queue capacity="1"/>
+	</si:channel>
+
+	<inbound-channel-adapter id="defaultAdapter" channel="requests"/>
+
+	<inbound-channel-adapter id="postOnlyAdapter" channel="requests" supported-methods="POST"/>
+
+	<inbound-channel-adapter id="putOrDeleteAdapter" channel="requests" supported-methods="PUT, delete"/>
+
+</beans:beans>
diff --git a/org.springframework.integration.http/src/test/java/org/springframework/integration/http/config/HttpInboundChannelAdapterParserTests.java b/org.springframework.integration.http/src/test/java/org/springframework/integration/http/config/HttpInboundChannelAdapterParserTests.java
new file mode 100644
index 0000000000..2b1e17cc9d
--- /dev/null
+++ b/org.springframework.integration.http/src/test/java/org/springframework/integration/http/config/HttpInboundChannelAdapterParserTests.java
@@ -0,0 +1,151 @@
+/*
+ * Copyright 2002-2009 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.integration.http.config;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
+import java.io.ByteArrayOutputStream;
+import java.io.ObjectOutputStream;
+import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import org.springframework.beans.DirectFieldAccessor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.integration.channel.PollableChannel;
+import org.springframework.integration.core.Message;
+import org.springframework.integration.http.HttpInboundEndpoint;
+import org.springframework.mock.web.MockHttpServletRequest;
+import org.springframework.mock.web.MockHttpServletResponse;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+/**
+ * @author Mark Fisher
+ */
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration
+public class HttpInboundChannelAdapterParserTests {
+
+	@Autowired
+	private PollableChannel requests;
+
+	@Autowired @Qualifier("defaultAdapter")
+	private HttpInboundEndpoint defaultAdapter;
+
+	@Autowired @Qualifier("postOnlyAdapter")
+	private HttpInboundEndpoint postOnlyAdapter;
+
+	@Autowired @Qualifier("putOrDeleteAdapter")
+	private HttpInboundEndpoint putOrDeleteAdapter;
+
+
+	@Test
+	@SuppressWarnings("unchecked")
+	public void getRequestOk() throws Exception {
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		request.setMethod("GET");
+		request.setParameter("foo", "bar");
+		MockHttpServletResponse response = new MockHttpServletResponse();
+		defaultAdapter.handleRequest(request, response);
+		assertEquals(HttpServletResponse.SC_OK, response.getStatus());
+		Message<?> message = requests.receive(0);
+		assertNotNull(message);
+		Object payload = message.getPayload();
+		assertTrue(payload instanceof Map);
+		Map<String, String[]> map = (Map<String, String[]>) payload;
+		assertEquals(1, map.size());
+		assertEquals("foo", map.keySet().iterator().next());
+		assertEquals(1, map.get("foo").length);
+		assertEquals("bar", map.get("foo")[0]);
+	}
+
+	@Test
+	public void getRequestNotAllowed() throws Exception {
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		request.setMethod("GET");
+		request.setParameter("foo", "bar");
+		MockHttpServletResponse response = new MockHttpServletResponse();
+		postOnlyAdapter.handleRequest(request, response);
+		assertEquals(HttpServletResponse.SC_METHOD_NOT_ALLOWED, response.getStatus());
+		Message<?> message = requests.receive(0);
+		assertNull(message);
+	}
+
+	@Test
+	public void postRequestWithTextContentOk() throws Exception {
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		request.setMethod("POST");
+		request.setContent("test".getBytes());
+		request.setContentType("text/plain");
+		MockHttpServletResponse response = new MockHttpServletResponse();
+		postOnlyAdapter.handleRequest(request, response);
+		assertEquals(HttpServletResponse.SC_OK, response.getStatus());
+		Message<?> message = requests.receive(0);
+		assertNotNull(message);
+		assertEquals("test", message.getPayload());
+	}
+
+	@Test
+	public void postRequestWithSerializedObjectContentOk() throws Exception {
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		request.setMethod("POST");
+		Object obj = new TestObject("testObject");
+		ByteArrayOutputStream byteStream = new ByteArrayOutputStream();
+		new ObjectOutputStream(byteStream).writeObject(obj);
+		request.setContent(byteStream.toByteArray());
+		request.setContentType("application/x-java-serialized-object");
+		MockHttpServletResponse response = new MockHttpServletResponse();
+		postOnlyAdapter.handleRequest(request, response);
+		assertEquals(HttpServletResponse.SC_OK, response.getStatus());
+		Message<?> message = requests.receive(0);
+		assertNotNull(message);
+		assertTrue(message.getPayload() instanceof TestObject);
+		assertEquals("testObject", ((TestObject) message.getPayload()).text);
+	}
+
+	@Test
+	@SuppressWarnings("unchecked")
+	public void putOrDeleteMethodsSupported() throws Exception {
+		DirectFieldAccessor accessor = new DirectFieldAccessor(putOrDeleteAdapter);
+		List<String> supportedMethods = (List<String>) accessor.getPropertyValue("supportedMethods");
+		assertEquals(2, supportedMethods.size());
+		assertTrue(supportedMethods.contains("PUT"));
+		assertTrue(supportedMethods.contains("DELETE"));
+	}
+
+
+	@SuppressWarnings("serial")
+	private static class TestObject implements Serializable {
+
+		String text;
+
+		TestObject(String text) {
+			this.text = text;
+		}
+	}
+
+}