diff --git a/source/test-resources/xforms/unit-tests/simple-test/components-test.xsd b/source/test-resources/xforms/unit-tests/simple-test/components-test.xsd
index 08d7210e3e..61e6ecb897 100644
--- a/source/test-resources/xforms/unit-tests/simple-test/components-test.xsd
+++ b/source/test-resources/xforms/unit-tests/simple-test/components-test.xsd
@@ -1,41 +1,41 @@
 <?xml version="1.0"?>
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
-	   xmlns:alfresco="http://www.alfresco.org/alfresco"
+	   xmlns:alf="http://www.alfresco.org"
 	   elementFormDefault="qualified">
   <xs:simpleType name="five_string_values">
     <xs:restriction base="xs:string">
-      <xs:enumeration id="five_string_values_one" value="one">
+      <xs:enumeration value="one">
 	<xs:annotation>
 	  <xs:appinfo>
-	    <alfresco:label>${components-test.five_string_values.one}</alfresco:label>
+	    <alf:label>${components-test.five_string_values.one}</alf:label>
 	  </xs:appinfo>
 	</xs:annotation>
       </xs:enumeration>
       <xs:enumeration value="two">
 	<xs:annotation>
 	  <xs:appinfo>
-	    <alfresco:label>${components-test.five_string_values.two}</alfresco:label>
+	    <alf:label>${components-test.five_string_values.two}</alf:label>
 	  </xs:appinfo>
 	</xs:annotation>
       </xs:enumeration>
       <xs:enumeration value="three">
 	<xs:annotation>
 	  <xs:appinfo>
-	    <alfresco:label>${components-test.five_string_values.three}</alfresco:label>
+	    <alf:label>${components-test.five_string_values.three}</alf:label>
 	  </xs:appinfo>
 	</xs:annotation>
       </xs:enumeration>
       <xs:enumeration value="four">
 	<xs:annotation>
 	  <xs:appinfo>
-	    <alfresco:label>${components-test.five_string_values.four}</alfresco:label>
+	    <alf:label>${components-test.five_string_values.four}</alf:label>
 	  </xs:appinfo>
 	</xs:annotation>
       </xs:enumeration>
       <xs:enumeration value="five">
 	<xs:annotation>
 	  <xs:appinfo>
-	    <alfresco:label>${components-test.five_string_values.five}</alfresco:label>
+	    <alf:label>${components-test.five_string_values.five}</alf:label>
 	  </xs:appinfo>
 	</xs:annotation>
       </xs:enumeration>
@@ -72,16 +72,16 @@
 	<xs:element name="required_textfield" type="xs:string" minOccurs="1" maxOccurs="1">
 	  <xs:annotation>
 	    <xs:appinfo>
-	      <alfresco:label>${components-test.required_textfield.label}</alfresco:label>
-	      <alfresco:alert>${components-test.required_textfield.alert}</alfresco:alert>
+	      <alf:label>${components-test.required_textfield.label}</alf:label>
+	      <alf:alert>${components-test.required_textfield.alert}</alf:alert>
 	    </xs:appinfo>
 	  </xs:annotation>
 	</xs:element>
 	<xs:element name="optional_textfield" type="xs:string" minOccurs="0" maxOccurs="1">
 	  <xs:annotation>
 	    <xs:appinfo>
-	      <alfresco:label>${components-test.optional_textfield.label}</alfresco:label>
-	      <alfresco:alert>${components-test.optional_textfield.alert}</alfresco:alert>
+	      <alf:label>${components-test.optional_textfield.label}</alf:label>
+	      <alf:alert>${components-test.optional_textfield.alert}</alf:alert>
 	    </xs:appinfo>
 	  </xs:annotation>
 	</xs:element>
@@ -110,8 +110,8 @@
 	<xs:element name="list_of_ten_select_three" type="ten_number_list_select_three">
 	  <xs:annotation>
 	    <xs:appinfo>
-	      <alfresco:label>${components-test.list_of_ten_select_three.label}</alfresco:label>
-	      <alfresco:alert>${components-test.list_of_ten_select_three.alert}</alfresco:alert>
+	      <alf:label>${components-test.list_of_ten_select_three.label}</alf:label>
+	      <alf:alert>${components-test.list_of_ten_select_three.alert}</alf:alert>
 	    </xs:appinfo>
 	  </xs:annotation>
 	</xs:element>
diff --git a/source/test-resources/xforms/unit-tests/simple-test/select1-test.xsd b/source/test-resources/xforms/unit-tests/simple-test/select1-test.xsd
new file mode 100644
index 0000000000..00d73edeea
--- /dev/null
+++ b/source/test-resources/xforms/unit-tests/simple-test/select1-test.xsd
@@ -0,0 +1,43 @@
+<?xml version="1.0"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+	   xmlns:alf="http://www.alfresco.org"
+	   elementFormDefault="qualified">
+  <xs:simpleType name="ten_string_values">
+    <xs:restriction base="xs:string">
+      <xs:enumeration value="one"/>
+      <xs:enumeration value="two"/>
+      <xs:enumeration value="three"/>
+      <xs:enumeration value="four"/>
+      <xs:enumeration value="five"/>
+      <xs:enumeration value="six"/>
+      <xs:enumeration value="seven"/>
+      <xs:enumeration value="eight"/>
+      <xs:enumeration value="nine"/>
+      <xs:enumeration value="ten"/>
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:element name="select1-test">
+    <xs:complexType>
+      <xs:sequence>
+	<xs:element name="required_combobox_with_default" 
+		    type="ten_string_values"
+		    minOccurs="1"
+		    maxOccurs="1"
+		    default="five"/>
+	<xs:element name="required_combobox_with_no_default" 
+		    minOccurs="1"
+		    maxOccurs="1"
+		    type="ten_string_values"/>
+	<xs:element name="optional_combobox_with_default" 
+		    type="ten_string_values"
+		    minOccurs="0"
+		    maxOccurs="1"
+		    default="five"/>
+	<xs:element name="optional_combobox_with_no_default" 
+		    minOccurs="0"
+		    maxOccurs="1"
+		    type="ten_string_values"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+</xs:schema>