diff --git a/pom.xml b/pom.xml
index a6226229e49..a00fad7d2de 100644
--- a/pom.xml
+++ b/pom.xml
@@ -105,19 +105,6 @@
     </dependencies>
 
     <build>
-
-        <testResources>
-            <testResource>
-                <directory>${basedir}/src/test/java</directory>
-                <includes>
-                    <include>**/*.json</include>
-                    <include>**/*.yml</include>
-                    <include>**/*.html</include>
-                    <include>**/*.txt</include>
-                </includes>
-            </testResource>
-        </testResources>
-
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
diff --git a/src/test/java/org/elasticsearch/plugin/mapper/attachments/test/SimpleAttachmentIntegrationTests.java b/src/test/java/org/elasticsearch/plugin/mapper/attachments/test/SimpleAttachmentIntegrationTests.java
index f3cf3c9c60c..66cf76c21db 100644
--- a/src/test/java/org/elasticsearch/plugin/mapper/attachments/test/SimpleAttachmentIntegrationTests.java
+++ b/src/test/java/org/elasticsearch/plugin/mapper/attachments/test/SimpleAttachmentIntegrationTests.java
@@ -100,7 +100,7 @@ public class SimpleAttachmentIntegrationTests {
     public void testSimpleAttachmentContentLengthLimit() throws Exception {
         String mapping = copyToStringFromClasspath("/org/elasticsearch/index/mapper/xcontent/test-mapping.json");
         byte[] txt = copyToBytesFromClasspath("/org/elasticsearch/index/mapper/xcontent/testContentLength.txt");
-        final int CONTENT_LENGTH_LIMIT = 18;
+        final int CONTENT_LENGTH_LIMIT = 20;
 
         node.client().admin().indices().putMapping(putMappingRequest("test").type("person").source(mapping)).actionGet();
 
diff --git a/src/test/java/org/elasticsearch/index/mapper/xcontent/test-mapping.json b/src/test/resources/org/elasticsearch/index/mapper/xcontent/test-mapping.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/mapper/xcontent/test-mapping.json
rename to src/test/resources/org/elasticsearch/index/mapper/xcontent/test-mapping.json
diff --git a/src/test/java/org/elasticsearch/index/mapper/xcontent/testContentLength.txt b/src/test/resources/org/elasticsearch/index/mapper/xcontent/testContentLength.txt
similarity index 100%
rename from src/test/java/org/elasticsearch/index/mapper/xcontent/testContentLength.txt
rename to src/test/resources/org/elasticsearch/index/mapper/xcontent/testContentLength.txt
diff --git a/src/test/java/org/elasticsearch/index/mapper/xcontent/testXHTML.html b/src/test/resources/org/elasticsearch/index/mapper/xcontent/testXHTML.html
similarity index 100%
rename from src/test/java/org/elasticsearch/index/mapper/xcontent/testXHTML.html
rename to src/test/resources/org/elasticsearch/index/mapper/xcontent/testXHTML.html