diff --git a/source/test-resources/xforms/unit-tests/repeat-components/repeat-components.xsd b/source/test-resources/xforms/unit-tests/repeat-components/repeat-components.xsd
deleted file mode 100644
index 32e3c0b954..0000000000
--- a/source/test-resources/xforms/unit-tests/repeat-components/repeat-components.xsd
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
-           elementFormDefault="qualified">
-  <xs:simpleType name="five_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:restriction>
-  </xs:simpleType>
-  <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:complexType name="multi-input">
-    <xs:sequence>
-      <xs:element name="string" type="xs:string"/>
-      <xs:element name="int" type="xs:anyType"/>
-    </xs:sequence>
-  </xs:complexType>
-  <xs:element name="repeat-components">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element name="zero-to-one" type="xs:string" minOccurs="0" maxOccurs="1"/>
-        <xs:element name="one-to-one" type="xs:anyType" minOccurs="1" maxOccurs="1"/>
-        <xs:element name="one-to-inf" type="xs:date" minOccurs="1" maxOccurs="unbounded"/>
-        <xs:element name="zero-to-inf" type="xs:integer" minOccurs="0" maxOccurs="unbounded"/>
-        <xs:element name="one-to-five" type="five_string_values" minOccurs="1" maxOccurs="5"/>
-        <xs:element name="zero-to-five" type="ten_string_values" minOccurs="0" maxOccurs="5"/>
-        <xs:element name="one-to-five-multi" type="multi-input" minOccurs="1" maxOccurs="5"/>
-        <xs:element name="zero-to-five-multi" type="multi-input" minOccurs="0" maxOccurs="5"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-</xs:schema>
diff --git a/source/test-resources/xforms/unit-tests/repeat-components/repeat-components.xsl b/source/test-resources/xforms/unit-tests/repeat-components/repeat-components.xsl
deleted file mode 100644
index ae49080b76..0000000000
--- a/source/test-resources/xforms/unit-tests/repeat-components/repeat-components.xsl
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet version="1.0"
-		xmlns:xhtml="http://www.w3.org/1999/xhtml"
-		xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-		exclude-result-prefixes="xhtml">
-
-  <xsl:output method="html" version="4.01" encoding="UTF-8" indent="yes"
-              doctype-public="-//W3C//DTD HTML 4.01 Transitional//EN"
-              doctype-system="http://www.w3.org/TR/html4/loose.dtd"/>
-  <xsl:preserve-space elements="*"/>
-
-  <xsl:template match="/">
-    <html>
-      <head>
-	<title>repeat-components</title>
-      </head>
-      <body>
-	<table border="1">
-          <tr><th>zero-to-one</th><td colspan="2"><xsl:value-of select="/repeat-components/zero-to-one"/></td></tr>
-	  <tr><th>one-to-one</th><td colspan="2"><xsl:value-of select="/repeat-components/one-to-one"/></td></tr>
-	  <tr>
-	    <th>
-	      <!--
-		  <xsl:attribute name="rowspan">
-                    <xsl:value-of select="count(/repeat-components/one-to-inf)"/>
-		  </xsl:attribute>
-		  -->
-	      one-to-inf
-            </th>
-	    <td>
-	      <ul>
-		<xsl:for-each select="/repeat-components/one-to-inf">
-		  <li><xsl:value-of select="."/></li>
-		</xsl:for-each>
-	      </ul>
-	    </td>
-	  </tr>
-	  <tr>
-	    <th>
-	      <!--	      
-			      <xsl:attribute name="rowspan">
-				<xsl:value-of select="count(/repeat-components/zero-to-inf)"/>
-			      </xsl:attribute>
-			      -->
-	      zero-to-inf
-            </th>
-	    <td>
-	      <ul>
-		<xsl:for-each select="/repeat-components/zero-to-inf">
-		  <li><xsl:value-of select="."/></li>
-		</xsl:for-each>
-	      </ul>
-	    </td>
-	  </tr>
-	  <tr>
-	    <th>
-	      <!--
-		  <xsl:attribute name="rowspan">
-                    <xsl:value-of select="count(/repeat-components/one-to-five)"/>
-		  </xsl:attribute>
-		  -->
-	      one-to-five
-	    </th>
-	    <td>
-	      <ul>
-		<xsl:for-each select="/repeat-components/one-to-five">
-		  <li colspan="2"><xsl:value-of select="."/></li>
-		</xsl:for-each>
-	      </ul>
-	    </td>
-	  </tr>
-	  <tr>
-	    <th>
-	      <!--
-	      <xsl:attribute name="rowspan">
-                <xsl:value-of select="count(/repeat-components/zero-to-five)"/>
-	      </xsl:attribute>
--->
-	      zero-to-five
-            </th>
-	    <td>
-	      <ul>
-		<xsl:for-each select="/repeat-components/zero-to-five">
-		  <li colspan="2"><xsl:value-of select="."/></li>
-		</xsl:for-each>
-	      </ul>
-	    </td>
-	  </tr>
-	  <tr>
-	    <th>
-	      <!--
-		  <xsl:attribute name="rowspan">
-                    <xsl:value-of select="count(/repeat-components/one-to-five-multi)"/>
-		  </xsl:attribute>
-		  -->
-	      one-to-five-multi
-            </th>
-	    <td>
-	      <ul>
-		<xsl:for-each select="/repeat-components/one-to-five-multi">
-		  <ul>
-		    <li><xsl:value-of select="string"/></li>
-		    <li><xsl:value-of select="int"/></li>
-		  </ul>
-		</xsl:for-each>
-	      </ul>
-	    </td>
-	  </tr>
-	  <tr>
-	    <th>
-	      <!--
-		  <xsl:attribute name="rowspan">
-		    <xsl:value-of select="count(/repeat-components/zero-to-five-multi)"/>
-		  </xsl:attribute>
-		  -->
-	      zero-to-five-multi
-	    </th>
-	    <td>
-	      <ul>
-		<xsl:for-each select="/repeat-components/zero-to-five-multi">
-		  <li>
-		    <ul>
-		      <li><xsl:value-of select="string"/></li>
-		      <li><xsl:value-of select="int"/></li>
-		    </ul>
-		  </li>
-		</xsl:for-each>
-	      </ul>
-	    </td>
-	  </tr>
-	</table>
-      </body>
-    </html>
-  </xsl:template>
-</xsl:stylesheet>
diff --git a/source/test-resources/xforms/unit-tests/repeat-simple/repeat-simple.xml b/source/test-resources/xforms/unit-tests/repeat-simple/repeat-simple.xml
deleted file mode 100644
index a5034a8c59..0000000000
--- a/source/test-resources/xforms/unit-tests/repeat-simple/repeat-simple.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<repeat-simple>
-  <zero-to-one>021</zero-to-one>
-  <one-to-one>121</one-to-one>
-  <one-to-inf>12inf-0</one-to-inf>
-  <one-to-inf>12inf-1</one-to-inf>
-  <one-to-inf>12inf-2</one-to-inf>
-  <zero-to-inf>02inf-0</zero-to-inf>
-  <one-to-five>125-0</one-to-five>
-  <one-to-five>125-1</one-to-five>
-  <one-to-five>125-2</one-to-five>
-  <zero-to-five>025-2</zero-to-five>
-  <one-to-five-multi><string>125m-s-0</string><int>125m-i-0</int></one-to-five-multi>
-  <one-to-five-multi><string>125m-s-1</string><int>125m-i-1</int></one-to-five-multi>
-  <zero-to-five-multi><string>025m-s-0</string><int>025m-i-0</int></zero-to-five-multi>
-</repeat-simple>
diff --git a/source/test-resources/xforms/unit-tests/repeat-simple/repeat-simple.xsd b/source/test-resources/xforms/unit-tests/repeat-simple/repeat-simple.xsd
deleted file mode 100644
index 49939445b1..0000000000
--- a/source/test-resources/xforms/unit-tests/repeat-simple/repeat-simple.xsd
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
-           elementFormDefault="qualified">
-  <xs:complexType name="multi-input">
-    <xs:sequence>
-      <xs:element name="string" type="xs:string"/>
-      <xs:element name="int" type="xs:int"/>
-    </xs:sequence>
-  </xs:complexType>
-  <xs:element name="repeat-simple">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element name="zero-to-one" type="xs:string" minOccurs="0" maxOccurs="1"/>
-        <xs:element name="one-to-one" type="xs:string" minOccurs="1" maxOccurs="1"/>
-        <xs:element name="one-to-inf" type="xs:string" minOccurs="1" maxOccurs="unbounded"/>
-        <xs:element name="zero-to-inf" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-        <xs:element name="one-to-five" type="xs:string" minOccurs="1" maxOccurs="5"/>
-        <xs:element name="three-to-five" type="xs:string" minOccurs="3" maxOccurs="5"/>
-        <xs:element name="zero-to-five" type="xs:string" minOccurs="0" maxOccurs="5"/>
-        <xs:element name="one-to-five-multi" type="multi-input" minOccurs="1" maxOccurs="5"/>
-        <xs:element name="zero-to-five-multi" type="multi-input" minOccurs="0" maxOccurs="5"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-</xs:schema>
diff --git a/source/test-resources/xforms/unit-tests/repeat-simple/repeat-simple.xsl b/source/test-resources/xforms/unit-tests/repeat-simple/repeat-simple.xsl
deleted file mode 100644
index cafd1af2e6..0000000000
--- a/source/test-resources/xforms/unit-tests/repeat-simple/repeat-simple.xsl
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet version="1.0"
-		xmlns:xhtml="http://www.w3.org/1999/xhtml"
-		xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-		exclude-result-prefixes="xhtml">
-
-  <xsl:output method="html" version="4.01" encoding="UTF-8" indent="yes"
-              doctype-public="-//W3C//DTD HTML 4.01 Transitional//EN"
-              doctype-system="http://www.w3.org/TR/html4/loose.dtd"/>
-  <xsl:preserve-space elements="*"/>
-
-  <xsl:template match="/">
-    <html>
-      <head>
-	<title>repeat-simple</title>
-      </head>
-      <body>
-	<table border="1">
-          <tr><th>zero-to-one</th><td colspan="2"><xsl:value-of select="/repeat-simple/zero-to-one"/></td></tr>
-	  <tr><th>one-to-one</th><td colspan="2"><xsl:value-of select="/repeat-simple/one-to-one"/></td></tr>
-	  <tr>
-	    <th>
-	      <!--
-		  <xsl:attribute name="rowspan">
-                    <xsl:value-of select="count(/repeat-simple/one-to-inf)"/>
-		  </xsl:attribute>
-		  -->
-	      one-to-inf
-            </th>
-	    <td>
-	      <ul>
-		<xsl:for-each select="/repeat-simple/one-to-inf">
-		  <li><xsl:value-of select="."/></li>
-		</xsl:for-each>
-	      </ul>
-	    </td>
-	  </tr>
-	  <tr>
-	    <th>
-	      <!--	      
-			      <xsl:attribute name="rowspan">
-				<xsl:value-of select="count(/repeat-simple/zero-to-inf)"/>
-			      </xsl:attribute>
-			      -->
-	      zero-to-inf
-            </th>
-	    <td>
-	      <ul>
-		<xsl:for-each select="/repeat-simple/zero-to-inf">
-		  <li><xsl:value-of select="."/></li>
-		</xsl:for-each>
-	      </ul>
-	    </td>
-	  </tr>
-	  <tr>
-	    <th>
-	      <!--
-		  <xsl:attribute name="rowspan">
-                    <xsl:value-of select="count(/repeat-simple/one-to-five)"/>
-		  </xsl:attribute>
-		  -->
-	      one-to-five
-	    </th>
-	    <td>
-	      <ul>
-		<xsl:for-each select="/repeat-simple/one-to-five">
-		  <li colspan="2"><xsl:value-of select="."/></li>
-		</xsl:for-each>
-	      </ul>
-	    </td>
-	  </tr>
-	  <tr>
-	    <th>
-	      <!--
-	      <xsl:attribute name="rowspan">
-                <xsl:value-of select="count(/repeat-simple/zero-to-five)"/>
-	      </xsl:attribute>
--->
-	      zero-to-five
-            </th>
-	    <td>
-	      <ul>
-		<xsl:for-each select="/repeat-simple/zero-to-five">
-		  <li colspan="2"><xsl:value-of select="."/></li>
-		</xsl:for-each>
-	      </ul>
-	    </td>
-	  </tr>
-	  <tr>
-	    <th>
-	      <!--
-		  <xsl:attribute name="rowspan">
-                    <xsl:value-of select="count(/repeat-simple/one-to-five-multi)"/>
-		  </xsl:attribute>
-		  -->
-	      one-to-five-multi
-            </th>
-	    <td>
-	      <ul>
-		<xsl:for-each select="/repeat-simple/one-to-five-multi">
-		  <ul>
-		    <li><xsl:value-of select="string"/></li>
-		    <li><xsl:value-of select="int"/></li>
-		  </ul>
-		</xsl:for-each>
-	      </ul>
-	    </td>
-	  </tr>
-	  <tr>
-	    <th>
-	      <!--
-		  <xsl:attribute name="rowspan">
-		    <xsl:value-of select="count(/repeat-simple/zero-to-five-multi)"/>
-		  </xsl:attribute>
-		  -->
-	      zero-to-five-multi
-	    </th>
-	    <td>
-	      <ul>
-		<xsl:for-each select="/repeat-simple/zero-to-five-multi">
-		  <li>
-		    <ul>
-		      <li><xsl:value-of select="string"/></li>
-		      <li><xsl:value-of select="int"/></li>
-		    </ul>
-		  </li>
-		</xsl:for-each>
-	      </ul>
-	    </td>
-	  </tr>
-	</table>
-      </body>
-    </html>
-  </xsl:template>
-</xsl:stylesheet>

zero-to-one
one-to-one
- - one-to-inf -	- - - - - -
- - zero-to-inf -	- - - - - -
- - one-to-five -	- - - - - -
- - zero-to-five -	- - - - - -
- - one-to-five-multi -	- - - - - - - - -
- - zero-to-five-multi -	- - - - - - - - - - -