diff --git a/src/main/java/org/elasticsearch/index/mapper/attachment/AttachmentMapper.java b/src/main/java/org/elasticsearch/index/mapper/attachment/AttachmentMapper.java
index 432e98602a165..c61eae568bd6c 100644
--- a/src/main/java/org/elasticsearch/index/mapper/attachment/AttachmentMapper.java
+++ b/src/main/java/org/elasticsearch/index/mapper/attachment/AttachmentMapper.java
@@ -44,16 +44,16 @@
 
 /**
  * <pre>
- *      field1 : "..."
+ *      "field1" : "..."
  * </pre>
  * <p>Or:
  * <pre>
  * {
- *      file1 : {
- *          _content_type : "application/pdf",
- *          _content_length : "500000000",
- *          _name : "..../something.pdf",
- *          content : ""
+ *      "file1" : {
+ *          "_content_type" : "application/pdf",
+ *          "_content_length" : "500000000",
+ *          "_name" : "..../something.pdf",
+ *          "_content" : ""
  *      }
  * }
  * </pre>
@@ -435,7 +435,11 @@ public void parse(ParseContext context) throws IOException {
             parsedContent = tika().parseToString(new BytesStreamInput(content, false), metadata, indexedChars);
         } catch (Throwable e) {
             // #18: we could ignore errors when Tika does not parse data
-            if (!ignoreErrors) throw new MapperParsingException("Failed to extract [" + indexedChars + "] characters of text for [" + name + "]", e);
+            if (!ignoreErrors) {
+                throw new MapperParsingException("Failed to extract [" + indexedChars + "] characters of text for [" + name + "]", e);
+            } else {
+                logger.debug("Failed to extract [{}] characters of text for [{}]: [{}]", indexedChars, name, e.getMessage());
+            }
             return;
         }
 
@@ -453,7 +457,7 @@ public void parse(ParseContext context) throws IOException {
                 context = context.createExternalValueContext(language);
                 languageMapper.parse(context);
             } catch(Throwable t) {
-                logger.warn("Cannot detect language: {}", t.getMessage());
+                logger.debug("Cannot detect language: [{}]", t.getMessage());
             }
         }
 
@@ -463,7 +467,8 @@ public void parse(ParseContext context) throws IOException {
                 nameMapper.parse(context);
             } catch(MapperParsingException e){
                 if (!ignoreErrors) throw e;
-                if (logger.isDebugEnabled()) logger.debug("Ignoring MapperParsingException catch while parsing name: {}", e.getMessage());
+                if (logger.isDebugEnabled()) logger.debug("Ignoring MapperParsingException catch while parsing name: [{}]",
+                        e.getMessage());
             }
         }
 
@@ -473,7 +478,8 @@ public void parse(ParseContext context) throws IOException {
                 dateMapper.parse(context);
             } catch(MapperParsingException e){
                 if (!ignoreErrors) throw e;
-                if (logger.isDebugEnabled()) logger.debug("Ignoring MapperParsingException catch while parsing date: {}: {}", e.getMessage(), context.externalValue());
+                if (logger.isDebugEnabled()) logger.debug("Ignoring MapperParsingException catch while parsing date: [{}]: [{}]",
+                        e.getMessage(), context.externalValue());
             }
         }
 
@@ -483,7 +489,8 @@ public void parse(ParseContext context) throws IOException {
                 titleMapper.parse(context);
             } catch(MapperParsingException e){
                 if (!ignoreErrors) throw e;
-                if (logger.isDebugEnabled()) logger.debug("Ignoring MapperParsingException catch while parsing title: {}: {}", e.getMessage(), context.externalValue());
+                if (logger.isDebugEnabled()) logger.debug("Ignoring MapperParsingException catch while parsing title: [{}]: [{}]",
+                        e.getMessage(), context.externalValue());
             }
         }
 
@@ -493,7 +500,8 @@ public void parse(ParseContext context) throws IOException {
                 authorMapper.parse(context);
             } catch(MapperParsingException e){
                 if (!ignoreErrors) throw e;
-                if (logger.isDebugEnabled()) logger.debug("Ignoring MapperParsingException catch while parsing author: {}: {}", e.getMessage(), context.externalValue());
+                if (logger.isDebugEnabled()) logger.debug("Ignoring MapperParsingException catch while parsing author: [{}]: [{}]",
+                        e.getMessage(), context.externalValue());
             }
         }
 
@@ -503,7 +511,8 @@ public void parse(ParseContext context) throws IOException {
                 keywordsMapper.parse(context);
             } catch(MapperParsingException e){
                 if (!ignoreErrors) throw e;
-                if (logger.isDebugEnabled()) logger.debug("Ignoring MapperParsingException catch while parsing keywords: {}: {}", e.getMessage(), context.externalValue());
+                if (logger.isDebugEnabled()) logger.debug("Ignoring MapperParsingException catch while parsing keywords: [{}]: [{}]",
+                        e.getMessage(), context.externalValue());
             }
         }
 
@@ -516,7 +525,7 @@ public void parse(ParseContext context) throws IOException {
                 contentTypeMapper.parse(context);
             } catch(MapperParsingException e){
                 if (!ignoreErrors) throw e;
-                if (logger.isDebugEnabled()) logger.debug("Ignoring MapperParsingException catch while parsing content_type: {}: {}", e.getMessage(), context.externalValue());
+                if (logger.isDebugEnabled()) logger.debug("Ignoring MapperParsingException catch while parsing content_type: [{}]: [{}]", e.getMessage(), context.externalValue());
             }
         }
 
@@ -531,7 +540,7 @@ public void parse(ParseContext context) throws IOException {
             contentLengthMapper.parse(context);
         } catch(MapperParsingException e){
             if (!ignoreErrors) throw e;
-            if (logger.isDebugEnabled()) logger.debug("Ignoring MapperParsingException catch while parsing content_length: {}: {}", e.getMessage(), context.externalValue());
+            if (logger.isDebugEnabled()) logger.debug("Ignoring MapperParsingException catch while parsing content_length: [{}]: [{}]", e.getMessage(), context.externalValue());
         }
 
 //        multiFields.parse(this, context);
diff --git a/src/test/resources/log4j.properties b/src/test/resources/log4j.properties
deleted file mode 100644
index 497c97f995974..0000000000000
--- a/src/test/resources/log4j.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-log4j.rootLogger=INFO, out
-
-log4j.appender.out=org.apache.log4j.ConsoleAppender
-log4j.appender.out.layout=org.apache.log4j.PatternLayout
-log4j.appender.out.layout.conversionPattern=[%d{ISO8601}][%-5p][%-25c] %m%n
diff --git a/src/test/resources/log4j.xml b/src/test/resources/log4j.xml
new file mode 100644
index 0000000000000..fe218dc24f0dd
--- /dev/null
+++ b/src/test/resources/log4j.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!-- Licensed to Elasticsearch (the "Author") under one or more contributor
+	license agreements. See the NOTICE file distributed with this work for additional 
+	information regarding copyright ownership. Author licenses this file to you 
+	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. -->
+
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
+	<appender name="console" class="org.apache.log4j.ConsoleAppender">
+		<param name="Target" value="System.out" />
+		<layout class="org.apache.log4j.PatternLayout">
+			<param name="ConversionPattern" value="[%d{ISO8601}][%-5p][%-25c] %m%n" />
+		</layout>
+	</appender>
+
+	<logger name="org.elasticsearch">
+		<level value="info" />
+	</logger>
+
+    <logger name="org.elasticsearch.index.mapper">
+        <level value="debug" />
+    </logger>
+
+    <root>
+		<priority value="info" />
+		<appender-ref ref="console" />
+	</root>
+
+</log4j:configuration>