diff --git a/samples/grpc-tomcat/src/main/java/org/springframework/grpc/sample/GrpcServerService.java b/samples/grpc-tomcat/src/main/java/org/springframework/grpc/sample/GrpcServerService.java
index c7ce150..3fea279 100644
--- a/samples/grpc-tomcat/src/main/java/org/springframework/grpc/sample/GrpcServerService.java
+++ b/samples/grpc-tomcat/src/main/java/org/springframework/grpc/sample/GrpcServerService.java
@@ -2,6 +2,7 @@ package org.springframework.grpc.sample;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.grpc.sample.proto.HelloReply;
 import org.springframework.grpc.sample.proto.HelloRequest;
 import org.springframework.grpc.sample.proto.SimpleGrpc;
@@ -14,6 +15,9 @@ public class GrpcServerService extends SimpleGrpc.SimpleImplBase {
 
 	private static Log log = LogFactory.getLog(GrpcServerService.class);
 
+	@Value("${stream.count:10}")
+	int COUNT = 0;
+
 	@Override
 	public void sayHello(HelloRequest req, StreamObserver<HelloReply> responseObserver) {
 		log.info("Hello " + req.getName());
@@ -26,7 +30,7 @@ public class GrpcServerService extends SimpleGrpc.SimpleImplBase {
 	public void streamHello(HelloRequest req, StreamObserver<HelloReply> responseObserver) {
 		log.info("Hello " + req.getName());
 		int count = 0;
-		while (count < 10) {
+		while (count < COUNT) {
 			HelloReply reply = HelloReply.newBuilder().setMessage("Hello(" + count + ") ==> " + req.getName()).build();
 			responseObserver.onNext(reply);
 			count++;
diff --git a/samples/grpc-tomcat/src/test/java/org/springframework/grpc/sample/GrpcServerApplicationTests.java b/samples/grpc-tomcat/src/test/java/org/springframework/grpc/sample/GrpcServerApplicationTests.java
index cd42223..48253e8 100644
--- a/samples/grpc-tomcat/src/test/java/org/springframework/grpc/sample/GrpcServerApplicationTests.java
+++ b/samples/grpc-tomcat/src/test/java/org/springframework/grpc/sample/GrpcServerApplicationTests.java
@@ -16,7 +16,7 @@ import org.springframework.grpc.sample.proto.SimpleGrpc;
 import org.springframework.test.annotation.DirtiesContext;
 
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
-		properties = "spring.grpc.client.default-channel.address=0.0.0.0:${local.server.port}")
+		properties = { "spring.grpc.client.default-channel.address=0.0.0.0:${local.server.port}", "stream.count=2" })
 @DirtiesContext
 public class GrpcServerApplicationTests {