diff --git a/server/zanata-war/src/test/java/org/zanata/adapter/PropertiesAbstractTest.java b/server/zanata-war/src/test/java/org/zanata/adapter/PropertiesAbstractTest.java
index d0d8b711000..a7bed274b7f 100644
--- a/server/zanata-war/src/test/java/org/zanata/adapter/PropertiesAbstractTest.java
+++ b/server/zanata-war/src/test/java/org/zanata/adapter/PropertiesAbstractTest.java
@@ -10,11 +10,10 @@
 
 import java.io.File;
 import java.io.FileOutputStream;
-import java.io.IOException;
 import java.io.OutputStreamWriter;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
-import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.Map;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -48,11 +47,15 @@ File createTempFile(Charset charset) throws Exception {
         File testFile = File.createTempFile("test-properties-temp-" + charset, ".properties");
         System.out.println(testFile);
         assertThat(testFile.exists());
-        Map<String, String> entries = new HashMap<>();
+        Map<String, String> entries = new LinkedHashMap<>();
         if (charset == StandardCharsets.ISO_8859_1) {
             entries.put("line1", "ÀLine One");
+            entries.put("line2", "ÀLine Two");
+            entries.put("line3", "ÀLine Three");
         } else if (charset == StandardCharsets.UTF_8) {
             entries.put("line1", "Â¥Line One");
+            entries.put("line2", "Â¥Line Two");
+            entries.put("line3", "Â¥Line Three");
         }
         Properties resource = new Properties();
         for (Map.Entry<String, String> entry : entries.entrySet()) {
diff --git a/server/zanata-war/src/test/java/org/zanata/adapter/PropertiesLatinOneAdapterTest.java b/server/zanata-war/src/test/java/org/zanata/adapter/PropertiesLatinOneAdapterTest.java
index 82ca0779dcc..de0b2af6afb 100644
--- a/server/zanata-war/src/test/java/org/zanata/adapter/PropertiesLatinOneAdapterTest.java
+++ b/server/zanata-war/src/test/java/org/zanata/adapter/PropertiesLatinOneAdapterTest.java
@@ -23,7 +23,6 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import java.io.*;
-import java.net.URI;
 import java.nio.charset.StandardCharsets;
 
 import com.google.common.base.Charsets;
@@ -44,6 +43,7 @@
 
 /**
  * @author Sean Flanigan <a href="mailto:sflaniga@redhat.com">sflaniga@redhat.com</a>
+ * @author Damian Jansen <a href="mailto:djansen@redhat.com">djansen@redhat.com</a>
  */
 public class PropertiesLatinOneAdapterTest extends PropertiesAbstractTest {
 
@@ -53,9 +53,11 @@ public void setup() {
     }
 
     @Test
-    public void parseLatinOneProperties() {
-        Resource resource = parseTestFile("test-properties-latin1.properties");
-        assertThat(resource.getTextFlows()).hasSize(3);
+    public void parseLatinOneProperties() throws Exception {
+        File latin1EncodedFile = createTempFile(StandardCharsets.ISO_8859_1);
+        Resource resource =
+                adapter.parseDocumentFile(latin1EncodedFile.toURI(), LocaleId.EN,
+                        Optional.absent());
         assertThat(resource.getTextFlows().get(0).getId()).isEqualTo(
                 "line1");
         assertThat(resource.getTextFlows().get(0).getContents())
@@ -86,7 +88,10 @@ public void testTranslatedPropertiesDocument() throws Exception {
         addTranslation(tResource, "line2", "ÀTbade metalkcta", ContentState.Translated);
         addTranslation(tResource, "line3", "ÀKbade metalkcta", ContentState.NeedReview);
 
-        Resource resource = parseTestFile("test-properties-latin1.properties");
+        File latin1EncodedFile = createTempFile(StandardCharsets.ISO_8859_1);
+        Resource resource =
+                adapter.parseDocumentFile(latin1EncodedFile.toURI(), LocaleId.EN,
+                        Optional.absent());
         ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
 
         adapter.writeTranslatedFile(outputStream,
@@ -107,16 +112,4 @@ private String toLatin1String(ByteArrayOutputStream outputStream)
             throws UnsupportedEncodingException {
         return outputStream.toString(Charsets.ISO_8859_1.name());
     }
-
-    @Test
-    public void testLatin1encoding() throws Exception {
-        File latin1EncodedFile = createTempFile(StandardCharsets.ISO_8859_1);
-        Resource resource =
-                adapter.parseDocumentFile(latin1EncodedFile.toURI(), LocaleId.EN,
-                        Optional.absent());
-        assertThat(resource.getTextFlows().get(0).getId()).isEqualTo(
-                "line1");
-        assertThat(resource.getTextFlows().get(0).getContents())
-                .containsExactly("ÀLine One");
-    }
 }
diff --git a/server/zanata-war/src/test/resources/org/zanata/adapter/test-properties-latin1.properties b/server/zanata-war/src/test/resources/org/zanata/adapter/test-properties-latin1.properties
deleted file mode 100644
index 7d65df84585..00000000000
--- a/server/zanata-war/src/test/resources/org/zanata/adapter/test-properties-latin1.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-line1=ÀLine One
-line2=ÀLine Two
-line3=ÀLine Three