diff --git a/src/test/groovy/lt/pow/nukagit/integration/NukagitIntegrationTest.groovy b/src/test/groovy/lt/pow/nukagit/integration/NukagitIntegrationTest.groovy
index 0fe6a3a..c33fdc5 100644
--- a/src/test/groovy/lt/pow/nukagit/integration/NukagitIntegrationTest.groovy
+++ b/src/test/groovy/lt/pow/nukagit/integration/NukagitIntegrationTest.groovy
@@ -129,7 +129,8 @@ class NukagitIntegrationTest extends Specification {
 
     def cleanup() {
         sshClient.stop()
-        component.grpcServer().shutdown()
+        component.grpcServer().shutdownNow()
+        component.grpcServer().awaitTermination(1, TimeUnit.SECONDS)
         component.sshServer().stop()
     }