diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jmx/JmxAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jmx/JmxAutoConfiguration.java
index 1274092a449..c69dbdd54af 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jmx/JmxAutoConfiguration.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jmx/JmxAutoConfiguration.java
@@ -25,18 +25,18 @@ import org.springframework.context.annotation.EnableMBeanExport;
 import org.springframework.jmx.export.MBeanExporter;
 
 /**
- * {@link EnableAutoConfiguration Auto-configuration} to enable/disiable Spring's
+ * {@link EnableAutoConfiguration Auto-configuration} to enable/disable Spring's
  * {@link EnableMBeanExport} mechanism based on configuration properties.
  * 
  * <p>
- * To enable auto export of annotation beans set <code>spring.jmx.enabled: true</code>.
+ * To disable auto export of annotation beans set <code>spring.jmx.enabled: false</code>.
  * 
  * @author Christian Dupuis
  */
 @Configuration
 @ConditionalOnClass({ MBeanExporter.class })
 @ConditionalOnMissingBean({ MBeanExporter.class })
-@ConditionalOnExpression("${spring.jmx.enabled:false}")
+@ConditionalOnExpression("${spring.jmx.enabled:true}")
 public class JmxAutoConfiguration {
 
 	@Configuration
diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jmx/JmxAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jmx/JmxAutoConfigurationTests.java
index 61092027353..bba6f096967 100644
--- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jmx/JmxAutoConfigurationTests.java
+++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jmx/JmxAutoConfigurationTests.java
@@ -56,8 +56,7 @@ public class JmxAutoConfigurationTests {
 		this.context = new AnnotationConfigApplicationContext();
 		this.context.register(JmxAutoConfiguration.class);
 		this.context.refresh();
-		this.thrown.expect(NoSuchBeanDefinitionException.class);
-		this.context.getBean(MBeanExporter.class);
+		assertNotNull(this.context.getBean(MBeanExporter.class));
 	}
 
 	@Test