diff --git a/buildSchemaRegistry.sh b/buildSchemaRegistry.sh
index 31356714c..7ca1f8e18 100755
--- a/buildSchemaRegistry.sh
+++ b/buildSchemaRegistry.sh
@@ -4,10 +4,10 @@ if [ "$#" -eq 1 ]; then
   ARGVALUE=$1
   if [[ $ARGVALUE == *"skipTest"* ]]; then
     echo "Skippping Tests"
-    ./mvnw clean install -f core/pom.xml -DskipTests
+    ./mvnw clean install -f schema-registry/pom.xml -DskipTests
   elif [[ $ARGVALUE == *"disable.checks"* ]]; then
     echo "Skippping checkstyle checks"
-    ./mvnw clean install -f core/pom.xml -Ddisable.checks=true
+    ./mvnw clean install -f schema-registry/pom.xml -Ddisable.checks=true
   fi
 else
   ./mvnw clean install -f schema-registry/pom.xml
diff --git a/schema-registry/spring-cloud-stream-schema-registry-client/src/main/java/org/springframework/cloud/stream/schema/registry/avro/AvroMessageConverterAutoConfiguration.java b/schema-registry/spring-cloud-stream-schema-registry-client/src/main/java/org/springframework/cloud/stream/schema/registry/avro/AvroMessageConverterAutoConfiguration.java
index 971825a98..0ffcb2799 100644
--- a/schema-registry/spring-cloud-stream-schema-registry-client/src/main/java/org/springframework/cloud/stream/schema/registry/avro/AvroMessageConverterAutoConfiguration.java
+++ b/schema-registry/spring-cloud-stream-schema-registry-client/src/main/java/org/springframework/cloud/stream/schema/registry/avro/AvroMessageConverterAutoConfiguration.java
@@ -41,8 +41,8 @@ import org.springframework.util.ReflectionUtils;
  */
 @Configuration(proxyBeanMethods = false)
 @ConditionalOnClass(name = "org.apache.avro.Schema")
-@ConditionalOnProperty(value = "spring.cloud.schemaRegistryClient.enabled", matchIfMissing = true)
-@ConditionalOnBean(type = "org.springframework.cloud.stream.schema.registry.client.SchemaRegistryClient")
+@ConditionalOnProperty(value = "spring.cloud.stream.schemaRegistryClient.enabled", matchIfMissing = true)
+@ConditionalOnBean(SchemaRegistryClient.class)
 @EnableConfigurationProperties({ AvroMessageConverterProperties.class })
 @Import(AvroSchemaServiceManagerImpl.class)
 public class AvroMessageConverterAutoConfiguration {
diff --git a/schema-registry/spring-cloud-stream-schema-registry-client/src/main/resources/META-INF/spring.factories b/schema-registry/spring-cloud-stream-schema-registry-client/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
similarity index 58%
rename from schema-registry/spring-cloud-stream-schema-registry-client/src/main/resources/META-INF/spring.factories
rename to schema-registry/spring-cloud-stream-schema-registry-client/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
index 6dd0ef937..b4358a8b8 100644
--- a/schema-registry/spring-cloud-stream-schema-registry-client/src/main/resources/META-INF/spring.factories
+++ b/schema-registry/spring-cloud-stream-schema-registry-client/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -1,3 +1 @@
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
 org.springframework.cloud.stream.schema.registry.avro.AvroMessageConverterAutoConfiguration
-
diff --git a/schema-registry/spring-cloud-stream-schema-registry-client/src/test/java/org/springframework/cloud/stream/schema/serialization/AvroSchemaRegistryClientMessageConverterTests.java b/schema-registry/spring-cloud-stream-schema-registry-client/src/test/java/org/springframework/cloud/stream/schema/serialization/AvroSchemaRegistryClientMessageConverterTests.java
index 1d3936dd9..097bb9902 100644
--- a/schema-registry/spring-cloud-stream-schema-registry-client/src/test/java/org/springframework/cloud/stream/schema/serialization/AvroSchemaRegistryClientMessageConverterTests.java
+++ b/schema-registry/spring-cloud-stream-schema-registry-client/src/test/java/org/springframework/cloud/stream/schema/serialization/AvroSchemaRegistryClientMessageConverterTests.java
@@ -198,7 +198,7 @@ public class AvroSchemaRegistryClientMessageConverterTests {
 
 		@Bean
 		ServletWebServerFactory servletWebServerFactory() {
-			return new TomcatServletWebServerFactory();
+			return new TomcatServletWebServerFactory(0);
 		}
 
 	}
diff --git a/schema-registry/spring-cloud-stream-schema-registry-server/src/test/java/org/springframework/cloud/stream/schema/registry/server/SchemaRegistryServerAvroTests.java b/schema-registry/spring-cloud-stream-schema-registry-server/src/test/java/org/springframework/cloud/stream/schema/registry/server/SchemaRegistryServerAvroTests.java
index e23f8352a..4a02dec47 100644
--- a/schema-registry/spring-cloud-stream-schema-registry-server/src/test/java/org/springframework/cloud/stream/schema/registry/server/SchemaRegistryServerAvroTests.java
+++ b/schema-registry/spring-cloud-stream-schema-registry-server/src/test/java/org/springframework/cloud/stream/schema/registry/server/SchemaRegistryServerAvroTests.java
@@ -71,9 +71,7 @@ import static org.springframework.test.annotation.DirtiesContext.ClassMode.AFTER
  * @author Christian Tzolov
  */
 @ExtendWith(SpringExtension.class)
-// @checkstyle:off
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT, properties = "spring.main.allow-bean-definition-overriding=true")
-// @checkstyle:on
 @DirtiesContext(classMode = AFTER_EACH_TEST_METHOD)
 public class SchemaRegistryServerAvroTests {