diff --git a/spring-integration-xml/src/test/java/org/springframework/integration/xml/selector/XmlValidatingMessageSelectorTests.java b/spring-integration-xml/src/test/java/org/springframework/integration/xml/selector/XmlValidatingMessageSelectorTests.java
new file mode 100644
index 0000000000..486f297dec
--- /dev/null
+++ b/spring-integration-xml/src/test/java/org/springframework/integration/xml/selector/XmlValidatingMessageSelectorTests.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2002-2010 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.xml.selector;
+
+import org.junit.Test;
+import org.springframework.core.io.ByteArrayResource;
+import org.springframework.core.io.Resource;
+import org.springframework.xml.validation.XmlValidatorFactory;
+
+/**
+ * @author Oleg Zhurakousky
+ *
+ */
+public class XmlValidatingMessageSelectorTests {
+
+	@Test
+	public void validateCreationWithSchemaAndDefaultSchemaType() throws Exception{
+		Resource resource = new ByteArrayResource("<xsd:schema xmlns:xsd='http://www.w3.org/2001/XMLSchema'/>".getBytes());
+		new XmlValidatingMessageSelector(resource, null);
+	}
+	
+	@Test
+	public void validateCreationWithSchemaAndProvidedSchemaType() throws Exception{
+		Resource resource = new ByteArrayResource("<xsd:schema xmlns:xsd='http://www.w3.org/2001/XMLSchema'/>".getBytes());
+		new XmlValidatingMessageSelector(resource, XmlValidatorFactory.SCHEMA_W3C_XML);
+	}
+	
+	@Test(expected=IllegalArgumentException.class)
+	public void validateFailureInvalidSchemaLanguage() throws Exception{
+		Resource resource = new ByteArrayResource("<xsd:schema xmlns:xsd='http://www.w3.org/2001/XMLSchema'/>".getBytes());
+		new XmlValidatingMessageSelector(resource, "foo");
+	}
+	
+	@Test(expected=IllegalArgumentException.class)
+	public void validateFailureWhenNoSchemaResourceProvided() throws Exception{
+		new XmlValidatingMessageSelector(null, null);
+	}
+}