diff --git a/spring-boot/src/test/java/org/springframework/boot/env/PropertiesPropertySourceLoaderTests.java b/spring-boot/src/test/java/org/springframework/boot/env/PropertiesPropertySourceLoaderTests.java
new file mode 100644
index 00000000000..2f0287c1102
--- /dev/null
+++ b/spring-boot/src/test/java/org/springframework/boot/env/PropertiesPropertySourceLoaderTests.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2012-2014 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.boot.env;
+
+import org.junit.Test;
+import org.springframework.core.env.PropertySource;
+import org.springframework.core.io.ClassPathResource;
+
+import static org.hamcrest.Matchers.equalTo;
+import static org.junit.Assert.assertThat;
+
+/**
+ * Tests for {@link PropertiesPropertySourceLoader}.
+ *
+ * @author Phillip Webb
+ */
+public class PropertiesPropertySourceLoaderTests {
+
+	private PropertiesPropertySourceLoader loader = new PropertiesPropertySourceLoader();
+
+	@Test
+	public void getFileExtensions() throws Exception {
+		assertThat(this.loader.getFileExtensions(), equalTo(new String[] { "properties",
+				"xml" }));
+	}
+
+	@Test
+	public void loadProperties() throws Exception {
+		PropertySource<?> source = this.loader.load("test.properties",
+				new ClassPathResource("test-properties.properties", getClass()), null);
+		assertThat(source.getProperty("test"), equalTo((Object) "properties"));
+	}
+
+	@Test
+	public void loadXml() throws Exception {
+		PropertySource<?> source = this.loader.load("test.xml", new ClassPathResource(
+				"test-xml.xml", getClass()), null);
+		assertThat(source.getProperty("test"), equalTo((Object) "xml"));
+	}
+
+}
diff --git a/spring-boot/src/test/resources/org/springframework/boot/env/test-properties.properties b/spring-boot/src/test/resources/org/springframework/boot/env/test-properties.properties
new file mode 100644
index 00000000000..1ddbab8c1e2
--- /dev/null
+++ b/spring-boot/src/test/resources/org/springframework/boot/env/test-properties.properties
@@ -0,0 +1 @@
+test=properties
diff --git a/spring-boot/src/test/resources/org/springframework/boot/env/test-xml.xml b/spring-boot/src/test/resources/org/springframework/boot/env/test-xml.xml
new file mode 100644
index 00000000000..5d3350e81fb
--- /dev/null
+++ b/spring-boot/src/test/resources/org/springframework/boot/env/test-xml.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
+<properties>
+	<entry key="test">xml</entry>
+</properties>