diff --git a/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/orm/jpa/AutoConfigureTestDatabaseWithNoDatabaseIntegrationTests.java b/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/orm/jpa/AutoConfigureTestDatabaseWithNoDatabaseIntegrationTests.java
index ee1cd687ca6..92f4eb03c9e 100644
--- a/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/orm/jpa/AutoConfigureTestDatabaseWithNoDatabaseIntegrationTests.java
+++ b/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/orm/jpa/AutoConfigureTestDatabaseWithNoDatabaseIntegrationTests.java
@@ -20,7 +20,7 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.SpringBootConfiguration;
+import org.springframework.boot.test.context.TestConfiguration;
 import org.springframework.context.ApplicationContext;
 import org.springframework.test.context.junit4.SpringRunner;
 
@@ -44,7 +44,7 @@ public class AutoConfigureTestDatabaseWithNoDatabaseIntegrationTests {
 		assertThat(this.context).isNotNull();
 	}
 
-	@SpringBootConfiguration
+	@TestConfiguration
 	static class Config {
 
 	}
diff --git a/spring-boot-test/src/main/java/org/springframework/boot/test/context/SpringBootConfigurationFinder.java b/spring-boot-test/src/main/java/org/springframework/boot/test/context/SpringBootConfigurationFinder.java
index 84a8112ef26..4c26c9f3d98 100644
--- a/spring-boot-test/src/main/java/org/springframework/boot/test/context/SpringBootConfigurationFinder.java
+++ b/spring-boot-test/src/main/java/org/springframework/boot/test/context/SpringBootConfigurationFinder.java
@@ -67,7 +67,8 @@ final class SpringBootConfigurationFinder {
 			Set<BeanDefinition> components = this.scanner.findCandidateComponents(source);
 			if (!components.isEmpty()) {
 				Assert.state(components.size() == 1,
-						"Found multiple @SpringBootConfiguration annotated classes");
+						"Found multiple @SpringBootConfiguration annotated classes "
+								+ components);
 				return ClassUtils.resolveClassName(
 						components.iterator().next().getBeanClassName(), null);
 			}