diff --git a/tests/integration/targets/test_mysql_db/tasks/state_dump_import.yml b/tests/integration/targets/test_mysql_db/tasks/state_dump_import.yml
index 5c70fadc..f8d2b4b4 100644
--- a/tests/integration/targets/test_mysql_db/tasks/state_dump_import.yml
+++ b/tests/integration/targets/test_mysql_db/tasks/state_dump_import.yml
@@ -119,7 +119,7 @@
   when:
     - >
       db_engine == 'mariadb' or
-      db_engine == 'mysql' and db_version is version('8.2', '<')
+      (db_engine == 'mysql' and db_version is version('8.2', '<'))
 
 - name: Dump and Import | Assert successful completion of dump operation for MySQL >= 8.2
   assert:
@@ -127,7 +127,8 @@
       - result is changed
       - result.executed_commands[0] is search(".department --source-data=1 --skip-triggers")
   when:
-    - db_engine == 'mysql' and db_version is version('8.2', '>=')
+    - db_engine == 'mysql'
+    - db_version is version('8.2', '>=')
 
 - name: Dump and Import | State dump/import - file name should exist (db_file_name)
   file:
diff --git a/tests/integration/targets/test_mysql_replication/tasks/mysql_replication_channel.yml b/tests/integration/targets/test_mysql_replication/tasks/mysql_replication_channel.yml
index d89d88e9..802865cd 100644
--- a/tests/integration/targets/test_mysql_replication/tasks/mysql_replication_channel.yml
+++ b/tests/integration/targets/test_mysql_replication/tasks/mysql_replication_channel.yml
@@ -54,7 +54,8 @@
           - result is changed
           - result.queries == result_query
       when:
-        - db_engine == 'mysql' and db_version is version('8.0.23', '>=')
+        - db_engine == 'mysql'
+        - db_version is version('8.0.23', '>=')
       vars:
         result_query: ["CHANGE REPLICATION SOURCE TO SOURCE_HOST='{{ mysql_host }}',\
           SOURCE_USER='{{ replication_user }}',SOURCE_PASSWORD='********',\
diff --git a/tests/integration/targets/test_mysql_replication/tasks/mysql_replication_primary_delay.yml b/tests/integration/targets/test_mysql_replication/tasks/mysql_replication_primary_delay.yml
index bb366966..3ae43391 100644
--- a/tests/integration/targets/test_mysql_replication/tasks/mysql_replication_primary_delay.yml
+++ b/tests/integration/targets/test_mysql_replication/tasks/mysql_replication_primary_delay.yml
@@ -34,7 +34,8 @@
           - result is changed
           - result.queries == ["CHANGE REPLICATION SOURCE TO SOURCE_DELAY=60"]
       when:
-        - db_engine == 'mysql' and db_version is version('8.0.23', '>=')
+        - db_engine == 'mysql'
+        - db_version is version('8.0.23', '>=')
 
     # Auxiliary step:
     - name: Start replica