diff --git a/spring-cloud-config-server/src/test/java/org/springframework/cloud/configure/server/EnvironmentControllerTests.java b/spring-cloud-config-server/src/test/java/org/springframework/cloud/configure/server/EnvironmentControllerTests.java
index f72c6723..f5419cc9 100644
--- a/spring-cloud-config-server/src/test/java/org/springframework/cloud/configure/server/EnvironmentControllerTests.java
+++ b/spring-cloud-config-server/src/test/java/org/springframework/cloud/configure/server/EnvironmentControllerTests.java
@@ -16,6 +16,7 @@
 package org.springframework.cloud.configure.server;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 import java.util.Collections;
 import java.util.HashMap;
@@ -65,7 +66,8 @@ public class EnvironmentControllerTests {
 		Map<String, Object> map = new LinkedHashMap<String, Object>();
 		map.put("a.b.c", "d");
 		environment.add(new PropertySource("one", map));
-		environment.addFirst(new PropertySource("two", Collections.singletonMap("a.b.c", "e")));
+		environment.addFirst(new PropertySource("two", Collections.singletonMap("a.b.c",
+				"e")));
 		Mockito.when(repository.findOne("foo", "bar", "master")).thenReturn(environment);
 		String yaml = controller.yaml("foo", "bar").getBody();
 		assertEquals("a:\n  b:\n    c: e\n", yaml);
@@ -91,31 +93,31 @@ public class EnvironmentControllerTests {
 		environment.add(new PropertySource("one", map));
 		Mockito.when(repository.findOne("foo", "bar", "master")).thenReturn(environment);
 		String yaml = controller.yaml("foo", "bar").getBody();
-		assertEquals("a:\n  b:\n  - d: e\n    c: d\n  - c: d\n", yaml);
+		assertTrue("Wrong output: " + yaml,
+				"a:\n  b:\n  - d: e\n    c: d\n  - c: d\n".equals(yaml)
+						|| "a:\n  b:\n  - c: d\n    d: e\n  - c: d\n".equals(yaml));
 	}
 
 	@Test
 	public void arrayOfObjectAtTopLevelInYaml() throws Exception {
 		Map<String, Object> map = new LinkedHashMap<String, Object>();
 		map.put("b[0].c", "d");
-		map.put("b[0].d", "e");
 		map.put("b[1].c", "d");
 		environment.add(new PropertySource("one", map));
 		Mockito.when(repository.findOne("foo", "bar", "master")).thenReturn(environment);
 		String yaml = controller.yaml("foo", "bar").getBody();
-		assertEquals("b:\n- c: d\n  d: e\n- c: d\n", yaml);
+		assertEquals("b:\n- c: d\n- c: d\n", yaml);
 	}
 
 	@Test
 	public void arrayOfObjectNestedLevelInYaml() throws Exception {
 		Map<String, Object> map = new LinkedHashMap<String, Object>();
 		map.put("x.a.b[0].c", "d");
-		map.put("x.a.b[0].d", "e");
 		map.put("x.a.b[1].c", "d");
 		environment.add(new PropertySource("one", map));
 		Mockito.when(repository.findOne("foo", "bar", "master")).thenReturn(environment);
 		String yaml = controller.yaml("foo", "bar").getBody();
-		assertEquals("x:\n  a:\n    b:\n    - c: d\n      d: e\n    - c: d\n", yaml);
+		assertEquals("x:\n  a:\n    b:\n    - c: d\n    - c: d\n", yaml);
 	}
 
 	@Test