diff --git a/client/query_test.go b/client/query_test.go
index 9c77ce5f9f..7f438f97c9 100644
--- a/client/query_test.go
+++ b/client/query_test.go
@@ -40,7 +40,9 @@ func (s *IntegrationTestSuite) TestQueryABCIHeight() {
 
 	for _, tc := range testCases {
 		s.Run(tc.name, func() {
-			s.network.WaitForHeight(tc.expHeight)
+			h, err := s.network.WaitForHeight(tc.expHeight)
+			s.Require().NoError(err)
+			s.Require().LessOrEqual(tc.expHeight, h)
 
 			val := s.network.Validators[0]