diff --git a/src/test/java/org/javarosa/core/model/instance/CsvExternalInstanceTest.java b/src/test/java/org/javarosa/core/model/instance/CsvExternalInstanceTest.java
index 4803ad0f9..3cd5b2b6f 100644
--- a/src/test/java/org/javarosa/core/model/instance/CsvExternalInstanceTest.java
+++ b/src/test/java/org/javarosa/core/model/instance/CsvExternalInstanceTest.java
@@ -28,6 +28,12 @@ public void heading_has_no_extra_quotes() {
         assertEquals("label", semiColonSeparated.getChildAt(0).getChildAt(0).getName());
     }
 
+    @Test
+    public void heading_spaces_are_not_stripped() {
+        assertEquals(" extra", commaSeparated.getChildAt(0).getChildAt(3).getName());
+        assertEquals(" extra", semiColonSeparated.getChildAt(0).getChildAt(3).getName());
+    }
+
     @Test
     public void value_has_no_extra_quotes() {
         assertEquals("A", commaSeparated.getChildAt(0).getChildAt(0).getValue().getValue());
@@ -54,6 +60,12 @@ public void missing_fields_replaced_with_spaces() {
         }
     }
 
+    @Test
+    public void value_spaces_are_not_stripped() {
+        assertEquals(" b", commaSeparated.getChildAt(8).getChildAt(1).getValue().getValue());
+        assertEquals(" b", semiColonSeparated.getChildAt(8).getChildAt(1).getValue().getValue());
+    }
+
     @Test
     public void ignores_utf8_bom() throws IOException {
         BOMInputStream bomIs = new BOMInputStream(new FileInputStream(r("external-secondary-csv-bom.csv")));
diff --git a/src/test/resources/org/javarosa/core/model/instance/external-secondary-comma-complex.csv b/src/test/resources/org/javarosa/core/model/instance/external-secondary-comma-complex.csv
index 20f509bfc..3d597b428 100644
--- a/src/test/resources/org/javarosa/core/model/instance/external-secondary-comma-complex.csv
+++ b/src/test/resources/org/javarosa/core/model/instance/external-secondary-comma-complex.csv
@@ -1,4 +1,4 @@
-"label","name","first"
+"label","name","first", extra
 "A","a",
 B,b,
 C,c
@@ -7,3 +7,4 @@ AB,ab,a
 AC
 "121 Main St, NE",main,m
 "text; more text",foo,bar
+a, b
diff --git a/src/test/resources/org/javarosa/core/model/instance/external-secondary-semicolon-complex.csv b/src/test/resources/org/javarosa/core/model/instance/external-secondary-semicolon-complex.csv
index 50bb116d0..b0761254e 100644
--- a/src/test/resources/org/javarosa/core/model/instance/external-secondary-semicolon-complex.csv
+++ b/src/test/resources/org/javarosa/core/model/instance/external-secondary-semicolon-complex.csv
@@ -1,4 +1,4 @@
-"label";"name";"first"
+"label";"name";"first"; extra
 "A";"a";
 B;b;
 C;c
@@ -7,3 +7,4 @@ AB;ab;a
 AC
 "121 Main St, NE";main;m
 "text; more text";foo;bar
+a; b