diff --git a/samples/grpc-server-kotlin/build.gradle b/samples/grpc-server-kotlin/build.gradle
index a9d60235..173edbe7 100644
--- a/samples/grpc-server-kotlin/build.gradle
+++ b/samples/grpc-server-kotlin/build.gradle
@@ -35,6 +35,7 @@ dependencies {
 
     implementation 'org.springframework.grpc:spring-grpc-spring-boot-starter'
     implementation 'org.springframework.boot:spring-boot-starter-actuator'
+    implementation("io.micrometer:context-propagation:1.2.0")
     implementation 'io.grpc:grpc-services'
     implementation "io.grpc:grpc-kotlin-stub:${kotlinStubVersion}"
 
diff --git a/samples/grpc-server-kotlin/pom.xml b/samples/grpc-server-kotlin/pom.xml
index f5e1fa23..c38a022b 100644
--- a/samples/grpc-server-kotlin/pom.xml
+++ b/samples/grpc-server-kotlin/pom.xml
@@ -68,6 +68,11 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-actuator</artifactId>
 		</dependency>
+        <dependency>
+            <groupId>io.micrometer</groupId>
+            <artifactId>context-propagation</artifactId>
+            <version>1.2.0</version>
+        </dependency>
 
 		<dependency>
 			<!-- for testing unix domain sockets -->
diff --git a/samples/grpc-server-kotlin/src/test/kotlin/org/springframework/grpc/sample/GrpcServerApplicationTests.kt b/samples/grpc-server-kotlin/src/test/kotlin/org/springframework/grpc/sample/GrpcServerApplicationTests.kt
index 319c9a32..51614de8 100644
--- a/samples/grpc-server-kotlin/src/test/kotlin/org/springframework/grpc/sample/GrpcServerApplicationTests.kt
+++ b/samples/grpc-server-kotlin/src/test/kotlin/org/springframework/grpc/sample/GrpcServerApplicationTests.kt
@@ -17,11 +17,12 @@ import org.springframework.test.annotation.DirtiesContext
         "spring.grpc.server.port=0",
         "spring.grpc.client.default-channel.address=0.0.0.0:\${local.grpc.port}"
     ],
-    useMainMethod = UseMainMethod.ALWAYS
 )
 @DirtiesContext
 class GrpcServerApplicationTests {
 
+    private val log: Log = LogFactory.getLog(this.javaClass)
+
     @Autowired
     private lateinit var stub: SimpleBlockingStub
 
@@ -39,13 +40,4 @@ class GrpcServerApplicationTests {
         )
         Assertions.assertEquals("Hello ==> Alien", response.getMessage())
     }
-
-    companion object {
-        private val log: Log = LogFactory.getLog(GrpcServerApplicationTests::class.java)
-
-        @JvmStatic
-        fun main(args: Array<String>) {
-            SpringApplicationBuilder(GrpcServerApplication::class.java).run()
-        }
-    }
 }
diff --git a/samples/grpc-server-kotlin/src/test/resources/application-ssl.properties b/samples/grpc-server-kotlin/src/test/resources/application-ssl.properties
deleted file mode 100644
index 50ad5c4c..00000000
--- a/samples/grpc-server-kotlin/src/test/resources/application-ssl.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-spring.grpc.server.ssl.bundle=ssltest
-spring.ssl.bundle.jks.ssltest.keystore.location=classpath:test.jks
-spring.ssl.bundle.jks.ssltest.keystore.password=secret
-spring.ssl.bundle.jks.ssltest.keystore.type=JKS
-spring.ssl.bundle.jks.ssltest.key.password=password
\ No newline at end of file
diff --git a/samples/grpc-server-kotlin/src/test/resources/test.jks b/samples/grpc-server-kotlin/src/test/resources/test.jks
deleted file mode 100644
index 6aa9a280..00000000
Binary files a/samples/grpc-server-kotlin/src/test/resources/test.jks and /dev/null differ
diff --git a/samples/settings.gradle b/samples/settings.gradle
index 63a68ea3..a794d86d 100644
--- a/samples/settings.gradle
+++ b/samples/settings.gradle
@@ -6,6 +6,7 @@ pluginManagement {
 	}
 }
 
+include 'grpc-client'
 include 'grpc-reactive'
 include 'grpc-oauth2'
 include 'grpc-secure'