diff --git a/source/java/org/alfresco/repo/content/MimetypeMapContentTest.java b/source/java/org/alfresco/repo/content/MimetypeMapContentTest.java
index 31846ef0c1..84e59a3f2d 100644
--- a/source/java/org/alfresco/repo/content/MimetypeMapContentTest.java
+++ b/source/java/org/alfresco/repo/content/MimetypeMapContentTest.java
@@ -78,6 +78,12 @@ public class MimetypeMapContentTest extends TestCase
                 mimetypeService.guessMimetype("image.bmp", openQuickTestFile("quick.bmp"))
         );
         
+        // Ones where we know about the parent, and Tika knows about the details
+        assertEquals(
+              "application/dita+xml", // Full version:  application/dita+xml;format=concept
+              mimetypeService.guessMimetype("concept.dita", openQuickTestFile("quickConcept.dita"))
+        );
+        
         // Alfresco Specific ones, that Tika doesn't know about
         assertEquals(
               "application/acp", 
diff --git a/source/test-resources/quick/quickConcept.dita b/source/test-resources/quick/quickConcept.dita
new file mode 100644
index 0000000000..5c011480b6
--- /dev/null
+++ b/source/test-resources/quick/quickConcept.dita
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN" "http://docs.oasis-open.org/dita/v1.1/OS/dtd/concept.dtd">
+<concept id="quickConcept">
+ <title>The quick brown fox jumps over the lazy dog</title>
+ <shortdesc>Gym class featuring a brown fox and lazy dog</shortdesc>
+ <prolog>
+  <author>Alfresco Documentation</author>
+  <copyright>
+   <copyryear year="2011"/>
+   <copyrholder>Alfresco Software, Inc.</copyrholder>
+  </copyright>
+  <metadata>
+   <audience experiencelevel="expert" job="Customizing" type="Administrator"/>
+   <category>Testing</category>
+   <keywords>
+    <keyword>Pangram</keyword>
+    <keyword>Fox</keyword>
+    <keyword>Dog</keyword>
+   </keywords>
+   <prodinfo>
+    <prodname>Enterprise</prodname>
+    <vrmlist>
+     <vrm version="3.4.x" release="Enterprise" modification="2011/11/11"/>
+    </vrmlist>
+   </prodinfo>
+  </metadata>
+ </prolog>
+ <conbody>
+   <p>The quick brown fox jumps over the lazy dog</p>
+ </conbody>
+</concept>