diff --git a/test/tap/tests/test_cluster_sync-t.cpp b/test/tap/tests/test_cluster_sync-t.cpp
index bf2337bec..4c31f4b0a 100644
--- a/test/tap/tests/test_cluster_sync-t.cpp
+++ b/test/tap/tests/test_cluster_sync-t.cpp
@@ -683,22 +683,7 @@ string fetch_runtime_checksum(MYSQL* admin, const string& module) {
 
 const int def_mod_diffs_sync = 2;
 
-int check_module_checksums_sync(
-	MYSQL* admin,
-	MYSQL* r_admin,
-	const conn_opts_t& conn_opts,
-	const sync_payload_t& module_sync,
-	int diffs_sync,
-	const string& logfile_path
-) {
-	const char new_remote_checksum_query_t[] {
-		"SELECT count(*) FROM stats_proxysql_servers_checksums WHERE "
-			"hostname='%s' AND port='%d' AND name='%s' AND checksum!='%s' AND checksum='%s'"
-	};
-	const char synced_runtime_checksums_query_t[] {
-		"SELECT COUNT(*) FROM runtime_checksums_values WHERE name='%s' AND checksum='%s'"
-	};
-
+int32_t get_checksum_sync_timeout(MYSQL* admin) {
 	const char q_check_intv[] {
 		"SELECT variable_value FROM global_variables WHERE variable_name='admin-cluster_check_interval_ms'"
 	};
@@ -707,7 +692,7 @@ int check_module_checksums_sync(
 	if (ext_check_intv.err != EXIT_SUCCESS) {
 		const string err { get_ext_val_err(admin, ext_check_intv) };
 		diag("Failed getting 'cluster_check_interval_ms'   query:`%s`, err:`%s`", q_check_intv, err.c_str());
-		return EXIT_FAILURE;
+		return -1;
 	}
 
 	const char q_sts_freq[] {
@@ -718,14 +703,37 @@ int check_module_checksums_sync(
 	if (ext_sts_freq.err != EXIT_SUCCESS) {
 		const string err { get_ext_val_err(admin, ext_check_intv) };
 		diag("Failed getting 'cluster_check_status_frequency'   query:`%s`, err:`%s`", q_check_intv, err.c_str());
-		return EXIT_FAILURE;
+		return -1;
 	}
 
+	return ((ext_check_intv.val/1000) * ext_sts_freq.val) + 1;
+}
+
+int check_module_checksums_sync(
+	MYSQL* admin,
+	MYSQL* r_admin,
+	const conn_opts_t& conn_opts,
+	const sync_payload_t& module_sync,
+	int diffs_sync,
+	const string& logfile_path
+) {
+	const char new_remote_checksum_query_t[] {
+		"SELECT count(*) FROM stats_proxysql_servers_checksums WHERE "
+			"hostname='%s' AND port='%d' AND name='%s' AND checksum!='%s' AND checksum='%s'"
+	};
+	const char synced_runtime_checksums_query_t[] {
+		"SELECT COUNT(*) FROM runtime_checksums_values WHERE name='%s' AND checksum='%s'"
+	};
+
 	// Store current remote checksum value
 	const string& module { module_sync.module };
 
 	// Checksum can not be present if we have just added the remote
-	uint32_t CHECKSUM_SYNC_TIMEOUT = ((ext_check_intv.val/1000) * ext_sts_freq.val) + 1;
+	uint32_t CHECKSUM_SYNC_TIMEOUT = get_checksum_sync_timeout(admin);
+	if (CHECKSUM_SYNC_TIMEOUT == -1) {
+		diag("Failed fetching values to compute 'CHECKSUM_SYNC_TIMEOUT'");
+		return EXIT_FAILURE;
+	}
 
 	const char wait_remote_checksums_init_t[] {
 		"SELECT LENGTH(checksum) FROM stats_proxysql_servers_checksums WHERE "
@@ -735,7 +743,7 @@ int check_module_checksums_sync(
 		cstr_format(wait_remote_checksums_init_t, conn_opts.host.c_str(), conn_opts.port, module.c_str())
 	};
 
-	int checksum_present = wait_for_node_sync( r_admin, { wait_remote_checksums_init.str }, CHECKSUM_SYNC_TIMEOUT);
+	int checksum_present = wait_for_node_sync(r_admin, { wait_remote_checksums_init.str }, CHECKSUM_SYNC_TIMEOUT);
 	if (checksum_present) {
 		diag("No checksum (or zero) detected int the target remote server for module '%s'", module.c_str());
 		return EXIT_FAILURE;
@@ -770,7 +778,7 @@ int check_module_checksums_sync(
 
 	if (ext_checksum.err != EXIT_SUCCESS) {
 		const string err { get_ext_val_err(admin, ext_checksum) };
-		diag("Failed query   query:`%s`, err:`%s`", q_check_intv, err.c_str());
+		diag("Failed query   query:`%s`, err:`%s`", q_module_checksum.str.c_str(), err.c_str());
 		return EXIT_FAILURE;
 	}
 
@@ -949,6 +957,19 @@ int check_all_modules_sync(
 		const sync_payload_t& sync_payload = module_sync_payloads[j];
 		const int diffs_sync = j == dis_module ? 0 : def_mod_diffs_sync;
 
+		// REQUIRE-WAIT: All checks make use of the 'admin_variables' to enable/disable module
+		// synchronization. The previous module check only waits for the module synchronization itself, but
+		// not for the propagation of the changed 'admin_variables'; not waiting the propagation of this
+		// previous change could interfere with the checks target to this same module.
+		if (module_sync_payloads[j].module == "admin_variables") {
+			uint32_t CHECKSUM_SYNC_TIMEOUT = get_checksum_sync_timeout(admin);
+			if (CHECKSUM_SYNC_TIMEOUT == -1) {
+				diag("Failed fetching values to compute 'CHECKSUM_SYNC_TIMEOUT'");
+				return EXIT_FAILURE;
+			}
+			sleep(CHECKSUM_SYNC_TIMEOUT);
+		}
+
 		int check_sync = check_module_checksums_sync(admin, r_admin, conn_opts, sync_payload, diffs_sync, remote_stderr);
 		if (check_sync) {
 			if (diffs_sync) {