diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/IntegrationManagementConfiguration.java b/spring-integration-core/src/main/java/org/springframework/integration/config/IntegrationManagementConfiguration.java
index 4d22082d71f..ef790cee7ab 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/config/IntegrationManagementConfiguration.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/config/IntegrationManagementConfiguration.java
@@ -44,7 +44,7 @@
  *
  * @since 4.2
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 public class IntegrationManagementConfiguration implements ImportAware, EnvironmentAware {
 
 	private AnnotationAttributes attributes;
@@ -60,7 +60,7 @@ public void setEnvironment(Environment environment) {
 	public void setImportMetadata(AnnotationMetadata importMetadata) {
 		Map<String, Object> map = importMetadata.getAnnotationAttributes(EnableIntegrationManagement.class.getName());
 		this.attributes = AnnotationAttributes.fromMap(map);
-		Assert.notNull(this.attributes,
+		Assert.notNull(this.attributes, () ->
 				"@EnableIntegrationManagement is not present on importing class " + importMetadata.getClassName());
 	}
 
@@ -85,7 +85,7 @@ public IntegrationManagementConfigurer managementConfigurer() {
 	}
 
 	private void setupCountsEnabledNamePatterns(IntegrationManagementConfigurer configurer) {
-		List<String> patterns = new ArrayList<String>();
+		List<String> patterns = new ArrayList<>();
 		String[] countsEnabled = this.attributes.getStringArray("countsEnabled");
 		for (String managedComponent : countsEnabled) {
 			String pattern = this.environment.resolvePlaceholders(managedComponent);
diff --git a/spring-integration-jmx/src/main/java/org/springframework/integration/jmx/config/IntegrationMBeanExportConfiguration.java b/spring-integration-jmx/src/main/java/org/springframework/integration/jmx/config/IntegrationMBeanExportConfiguration.java
index 0261247a20d..53bbb8d4cda 100644
--- a/spring-integration-jmx/src/main/java/org/springframework/integration/jmx/config/IntegrationMBeanExportConfiguration.java
+++ b/spring-integration-jmx/src/main/java/org/springframework/integration/jmx/config/IntegrationMBeanExportConfiguration.java
@@ -58,10 +58,13 @@
  *
  * @since 4.0
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 public class IntegrationMBeanExportConfiguration implements ImportAware, EnvironmentAware, BeanFactoryAware {
 
-	private static final String MBEAN_EXPORTER_NAME = "integrationMbeanExporter";
+	/**
+	 * A name for default {@link IntegrationMBeanExporter} bean.
+	 */
+	public static final String MBEAN_EXPORTER_NAME = "integrationMbeanExporter";
 
 	private AnnotationAttributes attributes;
 
@@ -95,7 +98,7 @@ public void setEnvironment(Environment environment) {
 	public void setImportMetadata(AnnotationMetadata importMetadata) {
 		Map<String, Object> map = importMetadata.getAnnotationAttributes(EnableIntegrationMBeanExport.class.getName());
 		this.attributes = AnnotationAttributes.fromMap(map);
-		Assert.notNull(this.attributes,
+		Assert.notNull(this.attributes, () ->
 				"@EnableIntegrationMBeanExport is not present on importing class " + importMetadata.getClassName());
 	}
 
@@ -121,7 +124,7 @@ public IntegrationMBeanExporter mbeanExporter() {
 
 	private void setupDomain(IntegrationMBeanExporter exporter) {
 		String defaultDomain = this.attributes.getString("defaultDomain");
-		if (defaultDomain != null && this.environment != null) {
+		if (this.environment != null) {
 			defaultDomain = this.environment.resolvePlaceholders(defaultDomain);
 		}
 		if (StringUtils.hasText(defaultDomain)) {
@@ -131,11 +134,11 @@ private void setupDomain(IntegrationMBeanExporter exporter) {
 
 	private void setupServer(IntegrationMBeanExporter exporter) {
 		String server = this.attributes.getString("server");
-		if (server != null && this.environment != null) {
+		if (this.environment != null) {
 			server = this.environment.resolvePlaceholders(server);
 		}
 		if (StringUtils.hasText(server)) {
-			MBeanServer bean = null;
+			MBeanServer bean;
 			if (server.startsWith("#{") && server.endsWith("}")) {
 				bean = (MBeanServer) this.resolver.evaluate(server, this.expressionContext);
 			}
@@ -159,7 +162,7 @@ private void setupComponentNamePatterns(IntegrationMBeanExporter exporter) {
 			String pattern = this.environment.resolvePlaceholders(managedComponent);
 			patterns.addAll(Arrays.asList(StringUtils.commaDelimitedListToStringArray(pattern)));
 		}
-		exporter.setComponentNamePatterns(patterns.toArray(new String[patterns.size()]));
+		exporter.setComponentNamePatterns(patterns.toArray(new String[0]));
 	}
 
 }