diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/annotation/OnResourceCondition.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/annotation/OnResourceCondition.java
index d9857c4c703..c2940534bef 100644
--- a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/annotation/OnResourceCondition.java
+++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/annotation/OnResourceCondition.java
@@ -47,7 +47,7 @@ class OnResourceCondition implements Condition {
 		String checking = ConditionLogUtils.getPrefix(logger, metadata);
 
 		MultiValueMap<String, Object> attributes = metadata.getAllAnnotationAttributes(
-				ConditionalOnClass.class.getName(), true);
+				ConditionalOnResource.class.getName(), true);
 		if (attributes != null) {
 			List<String> locations = new ArrayList<String>();
 			collectValues(locations, attributes.get("resources"));
@@ -59,7 +59,7 @@ class OnResourceCondition implements Condition {
 				}
 				if (!this.loader.getResource(location).exists()) {
 					if (logger.isDebugEnabled()) {
-						logger.debug(checking + "Found resource: " + location
+						logger.debug(checking + "Resource not found: " + location
 								+ " (search terminated with matches=false)");
 					}
 					return false;
diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/annotation/OnResourceConditionTests.java b/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/annotation/OnResourceConditionTests.java
new file mode 100644
index 00000000000..82b1a29ece3
--- /dev/null
+++ b/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/annotation/OnResourceConditionTests.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright 2012-2013 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.bootstrap.context.annotation;
+
+import org.junit.Test;
+import org.springframework.context.annotation.AnnotationConfigApplicationContext;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+/**
+ * @author Dave Syer
+ * 
+ */
+public class OnResourceConditionTests {
+
+	private AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext();
+
+	@Test
+	public void testResourceExists() {
+		this.context.register(BasicConfiguration.class);
+		this.context.refresh();
+		assertTrue(this.context.containsBean("foo"));
+		assertEquals("foo", this.context.getBean("foo"));
+	}
+
+	@Test
+	public void testResourceNotExists() {
+		this.context.register(MissingConfiguration.class);
+		this.context.refresh();
+		assertFalse(this.context.containsBean("foo"));
+	}
+
+	@Configuration
+	@ConditionalOnResource(resources = "foo")
+	protected static class MissingConfiguration {
+		@Bean
+		public String bar() {
+			return "bar";
+		}
+	}
+
+	@Configuration
+	@ConditionalOnResource(resources = "logback-test.xml")
+	protected static class BasicConfiguration {
+		@Bean
+		public String foo() {
+			return "foo";
+		}
+	}
+}