diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/AuditConfiguration.java b/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/AuditConfiguration.java
index 76e27150009..0fc17ef19a1 100644
--- a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/AuditConfiguration.java
+++ b/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/AuditConfiguration.java
@@ -36,10 +36,12 @@ public class AuditConfiguration {
 	@Autowired(required = false)
 	private AuditEventRepository auditEventRepository = new InMemoryAuditEventRepository();
 
-	@Bean
 	@ConditionalOnMissingBean(AuditEventRepository.class)
-	public AuditEventRepository auditEventRepository() throws Exception {
-		return this.auditEventRepository;
+	protected static class AuditEventRepositoryConfiguration {
+		@Bean
+		public AuditEventRepository auditEventRepository() throws Exception {
+			return new InMemoryAuditEventRepository();
+		}
 	}
 
 	@Bean
diff --git a/spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/autoconfigure/AuditConfigurationTests.java b/spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/autoconfigure/AuditConfigurationTests.java
new file mode 100644
index 00000000000..33aabdaef86
--- /dev/null
+++ b/spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/autoconfigure/AuditConfigurationTests.java
@@ -0,0 +1,40 @@
+/*
+ * 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.actuate.autoconfigure;
+
+import org.junit.Test;
+import org.springframework.bootstrap.actuate.audit.AuditEventRepository;
+import org.springframework.context.annotation.AnnotationConfigApplicationContext;
+
+import static org.junit.Assert.assertNotNull;
+
+/**
+ * @author Dave Syer
+ */
+public class AuditConfigurationTests {
+
+	private AnnotationConfigApplicationContext context;
+
+	@Test
+	public void testTraceConfiguration() throws Exception {
+		this.context = new AnnotationConfigApplicationContext();
+		this.context.register(AuditConfiguration.class);
+		this.context.refresh();
+		assertNotNull(this.context.getBean(AuditEventRepository.class));
+	}
+
+}