diff --git a/collect_app/src/androidTest/java/org/odk/collect/android/feature/formentry/InvalidFormTest.kt b/collect_app/src/androidTest/java/org/odk/collect/android/feature/formentry/InvalidFormTest.kt
index ebbef978b29..b5af28b38be 100644
--- a/collect_app/src/androidTest/java/org/odk/collect/android/feature/formentry/InvalidFormTest.kt
+++ b/collect_app/src/androidTest/java/org/odk/collect/android/feature/formentry/InvalidFormTest.kt
@@ -28,34 +28,21 @@ class InvalidFormTest {
     }
 
     @Test
-    fun app_ShouldNotCrash_whenFillingFormsWithErrors() {
-        rule.startAtMainMenu()
-            .copyForm("g6Error.xml")
-            .startBlankFormWithError("g6Error")
-            .clickOK(FormEntryPage("g6Error"))
-            .swipeToEndScreen()
-            .clickFinalize()
-            .checkIsSnackbarWithMessageDisplayed(R.string.form_saved)
-
-        MainMenuPage()
-            .copyForm("g6Error2.xml")
-            .startBlankForm("g6Error2")
-            .swipeToNextQuestionWithError()
-            .clickOK(FormEntryPage("g6Error2"))
-            .swipeToEndScreen()
-            .clickFinalize()
-            .checkIsSnackbarWithMessageDisplayed(R.string.form_saved)
-
+    fun app_ShouldNotCrash_whenFillingFormsWithEmptyGroupFieldList() {
         MainMenuPage()
             .copyForm("emptyGroupFieldList.xml")
             .clickFillBlankForm()
             .clickOnEmptyForm("emptyGroupFieldList")
             .clickFinalize()
             .checkIsSnackbarWithMessageDisplayed(R.string.form_saved)
+    }
 
-        MainMenuPage()
-            .copyForm("emptyGroupFieldList2.xml")
-            .startBlankForm("emptyGroupFieldList2")
+    @Test
+    fun app_ShouldNotCrash_whenFillingFormsWithRepeatInFieldList() {
+        rule.startAtMainMenu()
+            .copyForm("repeat_in_field_list.xml")
+            .startBlankFormWithError("repeat_in_field_list")
+            .clickOK(FormEntryPage("repeat_in_field_list"))
             .swipeToEndScreen()
             .clickFinalize()
             .checkIsSnackbarWithMessageDisplayed(R.string.form_saved)
diff --git a/test-forms/src/main/resources/forms/emptyGroupFieldList2.xml b/test-forms/src/main/resources/forms/emptyGroupFieldList2.xml
deleted file mode 100644
index 98abe781e80..00000000000
--- a/test-forms/src/main/resources/forms/emptyGroupFieldList2.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<h:html xmlns="http://www.w3.org/2002/xforms" xmlns:h="http://www.w3.org/1999/xhtml" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:jr="http://openrosa.org/javarosa">
-  <h:head>
-    <h:title>emptyGroupFieldList2</h:title>
-    <model>
-      <instance>
-        <data id="build_emptyGroupFieldList_15385922372">
-          <meta>
-            <instanceID/>
-          </meta>
-          <text0/>
-          <g>
-          </g>
-        </data>
-      </instance>
-      <itext>
-        <translation lang="English">
-          <text id="/data/g:label">
-            <value>g</value>
-          </text>
-          <text id="/data/text0:label">
-            <value>text0</value>
-          </text>
-        </translation>
-      </itext>
-      <bind nodeset="/data/meta/instanceID" type="string" readonly="true()" calculate="concat('uuid:', uuid())"/>
-      <bind nodeset="/data/text0" type="string"/>
-    </model>
-  </h:head>
-  <h:body>
-    <input ref="/data/text0">
-      <label ref="jr:itext('/data/text0:label')"/>
-    </input>
-    <group appearance="field-list">
-      <label ref="jr:itext('/data/g:label')"/>
-    </group>
-  </h:body>
-</h:html>
diff --git a/test-forms/src/main/resources/forms/g6Error2.xml b/test-forms/src/main/resources/forms/g6Error2.xml
deleted file mode 100644
index 87fd3b68ce1..00000000000
--- a/test-forms/src/main/resources/forms/g6Error2.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<h:html xmlns="http://www.w3.org/2002/xforms" xmlns:h="http://www.w3.org/1999/xhtml" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:jr="http://openrosa.org/javarosa">
-  <h:head>
-    <h:title>g6Error2</h:title>
-    <model>
-      <instance>
-        <data id="build_g6Error_15175684082">
-          <meta>
-            <instanceID/>
-          </meta>
-          <text0/>
-          <g1>
-            <text1/>
-            <g2 jr:template="">
-              <text2/>
-            </g2>
-          </g1>
-          <text3/>
-        </data>
-      </instance>
-      <itext>
-        <translation lang="English">
-          <text id="/data/g1:label">
-            <value>g1</value>
-          </text>
-          <text id="/data/g1/text1:label">
-            <value>text1</value>
-          </text>
-          <text id="/data/text0:label">
-            <value>text0</value>
-          </text>
-          <text id="/data/g1/g2:label">
-            <value>g2</value>
-          </text>
-          <text id="/data/g1/g2/text2:label">
-            <value>text2</value>
-          </text>
-          <text id="/data/text3:label">
-            <value>text3</value>
-          </text>
-        </translation>
-      </itext>
-      <bind nodeset="/data/meta/instanceID" type="string" readonly="true()" calculate="concat('uuid:', uuid())"/>
-      <bind nodeset="/data/text0" type="string"/>
-      <bind nodeset="/data/g1/text1" type="string"/>
-      <bind nodeset="/data/g1/g2/text2" type="string"/>
-      <bind nodeset="/data/text3" type="string"/>
-    </model>
-  </h:head>
-  <h:body>
-    <input ref="/data/text0">
-      <label ref="jr:itext('/data/text0:label')"/>
-    </input>
-    <group appearance="field-list">
-      <label ref="jr:itext('/data/g1:label')"/>
-      <input ref="/data/g1/text1">
-        <label ref="jr:itext('/data/g1/text1:label')"/>
-      </input>
-      <group>
-        <label ref="jr:itext('/data/g1/g2:label')"/>
-        <repeat nodeset="/data/g1/g2">
-          <input ref="/data/g1/g2/text2">
-            <label ref="jr:itext('/data/g1/g2/text2:label')"/>
-          </input>
-        </repeat>
-      </group>
-    </group>
-    <input ref="/data/text3">
-      <label ref="jr:itext('/data/text3:label')"/>
-    </input>
-  </h:body>
-</h:html>
diff --git a/test-forms/src/main/resources/forms/g6Error.xml b/test-forms/src/main/resources/forms/repeat_in_field_list.xml
similarity index 92%
rename from test-forms/src/main/resources/forms/g6Error.xml
rename to test-forms/src/main/resources/forms/repeat_in_field_list.xml
index 4efa283aacf..35934071372 100644
--- a/test-forms/src/main/resources/forms/g6Error.xml
+++ b/test-forms/src/main/resources/forms/repeat_in_field_list.xml
@@ -1,9 +1,9 @@
 <h:html xmlns="http://www.w3.org/2002/xforms" xmlns:h="http://www.w3.org/1999/xhtml" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:jr="http://openrosa.org/javarosa">
   <h:head>
-    <h:title>g6Error</h:title>
+    <h:title>repeat_in_field_list</h:title>
     <model>
       <instance>
-        <data id="build_g6Error_1517568408">
+        <data id="repeat_in_field_list">
           <meta>
             <instanceID/>
           </meta>