diff --git a/dspace-api/src/test/java/org/dspace/content/ItemTest.java b/dspace-api/src/test/java/org/dspace/content/ItemTest.java
index eb0acfb47c..590d4ae663 100644
--- a/dspace-api/src/test/java/org/dspace/content/ItemTest.java
+++ b/dspace-api/src/test/java/org/dspace/content/ItemTest.java
@@ -290,6 +290,8 @@ public class ItemTest  extends AbstractDSpaceObjectTest
         DCValue[] dc = it.getMetadata(schema, element, qualifier, lang);
         assertThat("testGetMetadata_4args 0",dc,notNullValue());
         assertTrue("testGetMetadata_4args 1",dc.length == 0);
+
+
     }
 
     /**
@@ -314,6 +316,23 @@ public class ItemTest  extends AbstractDSpaceObjectTest
         assertTrue("testGetMetadata_String 5",dc.length == 0);
     }
 
+    /**
+     * A test for DS-806: Item.match() incorrect logic for schema testing
+     */
+    @Test
+    public void testDS806()
+    {
+        // Set the item to have two pieces of metadata for dc.type and dc2.type
+        String dcType = "DC-TYPE";
+        String testType = "TEST-TYPE";
+        it.addMetadata("dc", "type", null, null, dcType);
+        it.addMetadata("test", "type", null, null, testType);
+
+        // Check that only one is returned when we ask for all dc.type values
+        DCValue[] values = it.getMetadata("dc", "type", null, null);
+        assertTrue("Return results", values.length == 1);
+    }
+
     /**
      * Test of addDC method, of class Item.
      */
diff --git a/dspace-api/src/test/resources/dspaceFolder/config/registries/dublin-core-types.xml b/dspace-api/src/test/resources/dspaceFolder/config/registries/dublin-core-types.xml
index 29c296ee4e..ccd9ceeb89 100644
--- a/dspace-api/src/test/resources/dspaceFolder/config/registries/dublin-core-types.xml
+++ b/dspace-api/src/test/resources/dspaceFolder/config/registries/dublin-core-types.xml
@@ -549,7 +549,7 @@
 	<schema>dc</schema>
     <element>subject</element>
     <qualifier>mesh</qualifier>
-    <scope_note>MEdical Subject Headings</scope_note>
+    <scope_note>Medical Subject Headings</scope_note>
   </dc-type>
 
   <dc-type>
@@ -584,4 +584,18 @@
     <scope_note>Nature or genre of content.</scope_note>
   </dc-type>
 
+
+  <!-- A second test schema for testing purposes. -->
+  <dc-schema>
+      <name>test</name>
+      <namespace>http://example.com/test/</namespace>
+  </dc-schema>
+
+  <dc-type>
+	<schema>test</schema>
+    <element>type</element>
+    <!-- unqualified -->
+    <scope_note>A second test schema type element.</scope_note>
+  </dc-type>
+
 </dspace-dc-types>