From e98aac4327fc6244047598f42a37053ebf528149 Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@pivotal.io>
Date: Wed, 30 Sep 2015 09:54:13 +0200
Subject: [PATCH] Polish d01bc41

Closes gh-2516
---
 .../boot/test/SpringApplicationContextLoader.java               | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-boot/src/main/java/org/springframework/boot/test/SpringApplicationContextLoader.java b/spring-boot/src/main/java/org/springframework/boot/test/SpringApplicationContextLoader.java
index a360291dd8..a017613ee8 100644
--- a/spring-boot/src/main/java/org/springframework/boot/test/SpringApplicationContextLoader.java
+++ b/spring-boot/src/main/java/org/springframework/boot/test/SpringApplicationContextLoader.java
@@ -212,7 +212,7 @@ public class SpringApplicationContextLoader extends AbstractContextLoader {
 	public void processContextConfiguration(
 			ContextConfigurationAttributes configAttributes) {
 		super.processContextConfiguration(configAttributes);
-		if (!configAttributes.hasLocations() && !configAttributes.hasClasses()) {
+		if (!configAttributes.hasResources()) {
 			Class<?>[] defaultConfigClasses = detectDefaultConfigurationClasses(configAttributes
 					.getDeclaringClass());
 			configAttributes.setClasses(defaultConfigClasses);