diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandlerTests.java b/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandlerTests.java
index d6a5f42fd6a..38ee77b94e6 100644
--- a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandlerTests.java
+++ b/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandlerTests.java
@@ -17,6 +17,7 @@
 package org.springframework.web.servlet.resource;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
@@ -134,6 +135,14 @@ public class ResourceHttpRequestHandlerTests {
 		response = new MockHttpServletResponse();
 		handler.handleRequest(request, response);
 		assertEquals(404, response.getStatus());
+
+		handler.setLocations(Arrays.<Resource>asList(new ClassPathResource("testsecret/", getClass())));
+		request.setAttribute(HandlerMapping.PATH_WITHIN_HANDLER_MAPPING_ATTRIBUTE, "secret.txt");
+		response = new MockHttpServletResponse();
+		handler.handleRequest(request, response);
+		assertEquals(200, response.getStatus());
+		assertEquals("text/plain", response.getContentType());
+		assertEquals("big secret", response.getContentAsString());
 	}
 
 	@Test
diff --git a/org.springframework.web.servlet/src/test/resources/org/springframework/web/servlet/resource/testsecret/secret.txt b/org.springframework.web.servlet/src/test/resources/org/springframework/web/servlet/resource/testsecret/secret.txt
new file mode 100644
index 00000000000..541425afced
--- /dev/null
+++ b/org.springframework.web.servlet/src/test/resources/org/springframework/web/servlet/resource/testsecret/secret.txt
@@ -0,0 +1 @@
+big secret
\ No newline at end of file
diff --git a/spring-framework.ipr b/spring-framework.ipr
index 15ded308fc0..7eeaabcb018 100644
--- a/spring-framework.ipr
+++ b/spring-framework.ipr
@@ -213,6 +213,7 @@
     </resourceExtensions>
     <wildcardResourcePatterns>
       <entry name="*.properties" />
+      <entry name="*.txt" />
       <entry name="*.xml" />
       <entry name="*.gif" />
       <entry name="*.png" />