diff --git a/spring-boot/src/test/java/org/springframework/boot/test/ConfigFileApplicationContextInitializerTests.java b/spring-boot/src/test/java/org/springframework/boot/test/ConfigFileApplicationContextInitializerTests.java
index 7b39c71148e9..15f76d7213e9 100644
--- a/spring-boot/src/test/java/org/springframework/boot/test/ConfigFileApplicationContextInitializerTests.java
+++ b/spring-boot/src/test/java/org/springframework/boot/test/ConfigFileApplicationContextInitializerTests.java
@@ -40,7 +40,7 @@ public class ConfigFileApplicationContextInitializerTests {
 	private Environment environment;
 
 	@Test
-	public void test() {
+	public void initializerPopulatesEnvironment() {
 		assertThat(this.environment.getProperty("foo"), equalTo("bucket"));
 	}
 
diff --git a/spring-boot/src/test/java/org/springframework/boot/test/SpringApplicationConfigurationGroovyConfigurationTests.java b/spring-boot/src/test/java/org/springframework/boot/test/SpringApplicationConfigurationGroovyConfigurationTests.java
new file mode 100644
index 000000000000..a61e8a7f0b67
--- /dev/null
+++ b/spring-boot/src/test/java/org/springframework/boot/test/SpringApplicationConfigurationGroovyConfigurationTests.java
@@ -0,0 +1,43 @@
+/*
+ * 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.test;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+import static org.junit.Assert.assertNotNull;
+
+/**
+ * Tests for {@link SpringApplicationContextLoader} (detectDefaultConfigurationClasses).
+ * 
+ * @author Dave Syer
+ */
+@RunWith(SpringJUnit4ClassRunner.class)
+@SpringApplicationConfiguration(locations = "classpath:test.groovy")
+public class SpringApplicationConfigurationGroovyConfigurationTests {
+
+	@Autowired
+	private String foo;
+
+	@Test
+	public void groovyConfigLoaded() {
+		assertNotNull(this.foo);
+	}
+
+}
diff --git a/spring-boot/src/test/java/org/springframework/boot/test/SpringApplicationConfigurationMixedConfigurationTests.java b/spring-boot/src/test/java/org/springframework/boot/test/SpringApplicationConfigurationMixedConfigurationTests.java
new file mode 100644
index 000000000000..f474eef4d760
--- /dev/null
+++ b/spring-boot/src/test/java/org/springframework/boot/test/SpringApplicationConfigurationMixedConfigurationTests.java
@@ -0,0 +1,56 @@
+/*
+ * 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.test;
+
+import org.junit.Ignore;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.SpringApplicationConfigurationMixedConfigurationTests.Config;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+import static org.junit.Assert.assertNotNull;
+
+/**
+ * Tests for {@link SpringApplicationContextLoader}.
+ * 
+ * @author Dave Syer
+ */
+@RunWith(SpringJUnit4ClassRunner.class)
+@SpringApplicationConfiguration(classes = Config.class, locations = "classpath:test.groovy")
+@Ignore("classes and locations together are not supported in Spring Test (for legacy reasons)")
+public class SpringApplicationConfigurationMixedConfigurationTests {
+
+	@Autowired
+	private String foo;
+
+	@Autowired
+	private Config config;
+
+	@Test
+	public void mixedConfigClasses() {
+		assertNotNull(this.foo);
+		assertNotNull(this.config);
+	}
+
+	@Configuration
+	protected static class Config {
+
+	}
+
+}
diff --git a/spring-boot/src/test/java/org/springframework/boot/test/SpringApplicationIntegrationTestTests.java b/spring-boot/src/test/java/org/springframework/boot/test/SpringApplicationIntegrationTestTests.java
index 688267732cd0..507433137bef 100644
--- a/spring-boot/src/test/java/org/springframework/boot/test/SpringApplicationIntegrationTestTests.java
+++ b/spring-boot/src/test/java/org/springframework/boot/test/SpringApplicationIntegrationTestTests.java
@@ -45,7 +45,7 @@
 public class SpringApplicationIntegrationTestTests {
 
 	@Test
-	public void nestedConfigClasses() {
+	public void runAndTestHttpEndpoint() {
 		String body = new RestTemplate().getForObject("http://localhost:8080/",
 				String.class);
 		assertEquals("Hello World", body);
diff --git a/spring-boot/src/test/resources/test.groovy b/spring-boot/src/test/resources/test.groovy
new file mode 100644
index 000000000000..79626065c977
--- /dev/null
+++ b/spring-boot/src/test/resources/test.groovy
@@ -0,0 +1,3 @@
+beans {
+  foo String, "World"
+}
\ No newline at end of file