diff --git a/tests/remote_config/test_remote_configuration.py b/tests/remote_config/test_remote_configuration.py
index 95c6a6f0521..62a87f89715 100644
--- a/tests/remote_config/test_remote_configuration.py
+++ b/tests/remote_config/test_remote_configuration.py
@@ -210,9 +210,6 @@ def validate(data: dict) -> bool:
                 return False
 
             logger.info(f"validating request number {self.request_number}")
-            if self.request_number >= len(asm_features_expected_requests):
-                return True
-
             rc_check_request(data, asm_features_expected_requests[self.request_number], caching=True)
 
             self.python_request_number += 1
@@ -226,7 +223,7 @@ def validate(data: dict) -> bool:
             else:
                 self.request_number += 1
 
-            return False
+            return self.request_number >= len(asm_features_expected_requests)
 
         interfaces.library.validate_one_remote_configuration(validator=validate)
 
@@ -311,14 +308,11 @@ def validate(data: dict) -> bool:
 
             runtime_id = data["request"]["content"]["client"]["client_tracer"]["runtime_id"]
             logger.info(f"validating request number {request_number[runtime_id]}")
-            if request_number[runtime_id] >= len(live_debugging_expected_requests):
-                return True
-
             rc_check_request(data, live_debugging_expected_requests[request_number[runtime_id]], caching=True)
 
             request_number[runtime_id] += 1
 
-            return False
+            return request_number[runtime_id] >= len(live_debugging_expected_requests)
 
         interfaces.library.validate_one_remote_configuration(validator=validate)
 
@@ -355,15 +349,12 @@ def validate(data: dict) -> bool:
             if not self.response_has_been_overwritten(data):
                 return False
 
-            if self.request_number >= len(asm_dd_expected_requests):
-                return True
-
             logger.info(f"Validating request #{self.request_number} in {data['log_filename']}")
             rc_check_request(data, asm_dd_expected_requests[self.request_number], caching=True)
 
             self.request_number += 1
 
-            return False
+            return self.request_number >= len(asm_dd_expected_requests)
 
         interfaces.library.validate_one_remote_configuration(validator=validate)
 
@@ -403,14 +394,11 @@ def validate(data: dict) -> bool:
                 return False
 
             logger.info(f"validating request number {self.request_number}")
-            if self.request_number >= len(asm_features_expected_requests):
-                return True
-
             rc_check_request(data, asm_features_expected_requests[self.request_number], caching=False)
 
             self.request_number += 1
 
-            return False
+            return self.request_number >= len(asm_features_expected_requests)
 
         interfaces.library.validate_one_remote_configuration(validator=validate)
 
@@ -448,14 +436,11 @@ def validate(data: dict) -> bool:
                 return False
 
             logger.info(f"validating request number {self.request_number}")
-            if self.request_number >= len(asm_dd_expected_requests):
-                return True
-
             rc_check_request(data, asm_dd_expected_requests[self.request_number], caching=False)
 
             self.request_number += 1
 
-            return False
+            return self.request_number >= len(asm_dd_expected_requests)
 
         interfaces.library.validate_one_remote_configuration(validator=validate)