diff --git a/tests/integration/grpc/grpc_suite_test.go b/tests/integration/grpc/grpc_suite_test.go
index fdc41b23aba..b387e390a65 100644
--- a/tests/integration/grpc/grpc_suite_test.go
+++ b/tests/integration/grpc/grpc_suite_test.go
@@ -146,7 +146,7 @@ func startRevads(configs map[string]string, variables map[string]string) (map[st
 				if err != nil {
 					return errors.Wrap(err, "Could not kill revad")
 				}
-				waitForPort(ownAddress, "close")
+				_ = waitForPort(ownAddress, "close")
 				if keepLogs {
 					fmt.Println("Test failed, keeping root", tmpRoot, "around for debugging")
 				} else {
diff --git a/tests/integration/grpc/userprovider_test.go b/tests/integration/grpc/userprovider_test.go
index 24bb7a77a9e..3af96337863 100644
--- a/tests/integration/grpc/userprovider_test.go
+++ b/tests/integration/grpc/userprovider_test.go
@@ -72,7 +72,7 @@ var _ = Describe("user providers", func() {
 
 	AfterEach(func() {
 		for _, r := range revads {
-			r.Cleanup(CurrentGinkgoTestDescription().Failed)
+			Expect(r.Cleanup(CurrentGinkgoTestDescription().Failed))
 		}
 	})