diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/CaseSchema.xsd b/Core/src/org/sleuthkit/autopsy/casemodule/CaseSchema.xsd
index 50f0130589..442eae823f 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/CaseSchema.xsd
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/CaseSchema.xsd
@@ -12,9 +12,9 @@
 
 <xs:element name="Examiner" type="String" nillable="true"/>
 
-<xs:element name="CaseType" type="String" minOccurs="0" maxOccurs="1" nillable="false"/>
+<xs:element name="CaseType" type="String" nillable="false"/>
 
-<xs:element name="DatabaseName" type="String" minOccurs="0" maxOccurs="1" nillable="false"/>
+<xs:element name="DatabaseName" type="String" nillable="false"/>
 
 <xs:attribute name="Relative" type="xs:boolean"/>
 
@@ -96,8 +96,10 @@
             <xs:element ref="LogFolder"/>
             <xs:element ref="TempFolder"/>
             <xs:element ref="CacheFolder"/>
-            <xs:element ref="CaseType"/>
-            <xs:element ref="DatabaseName"/>
+            <xs:sequence minOccurs="0" maxOccurs="1">
+                <xs:element ref="CaseType"/>
+                <xs:element ref="DatabaseName"/>
+            </xs:sequence>
         </xs:sequence>
     </xs:complexType>
 </xs:element>