diff --git a/tests/integration/targets/test_mysql_db/tasks/config_overrides_defaults.yml b/tests/integration/targets/test_mysql_db/tasks/config_overrides_defaults.yml
index 90c72b5..c2fda2a 100644
--- a/tests/integration/targets/test_mysql_db/tasks/config_overrides_defaults.yml
+++ b/tests/integration/targets/test_mysql_db/tasks/config_overrides_defaults.yml
@@ -14,7 +14,12 @@
 - name: Add blank line
   shell: 'echo "" >> {{ config_file }}'
   when:
-  - (connector.name.0 is search('pymysql') and connector_ver is version('0.9.3', '>=')) or connector.name.0 is not search('pymysql')
+    - >
+      connector_name is not search('pymysql')
+      or (
+        connector_name is search('pymysql')
+        and connector_ver is version('0.9.3', '>=')
+      )
 
 - name: Create include_dir
   file:
@@ -22,7 +27,12 @@
     state: directory
     mode: '0777'
   when:
-  - (connector.name.0 is search('pymysql') and connector_ver is version('0.9.3', '>=')) or connector.name.0 is not search('pymysql')
+    - >
+      connector_name is not search('pymysql')
+      or (
+        connector_name is search('pymysql')
+        and connector_ver is version('0.9.3', '>=')
+      )
 
 - name: Add include_dir
   lineinfile:
@@ -30,7 +40,12 @@
     line: '!includedir {{ include_dir }}'
     insertafter: EOF
   when:
-  - (connector.name.0 is search('pymysql') and connector_ver is version('0.9.3', '>=')) or connector.name.0 is not search('pymysql')
+    - >
+      connector_name is not search('pymysql')
+      or (
+        connector_name is search('pymysql')
+        and connector_ver is version('0.9.3', '>=')
+      )
 
 - name: Create database using fake port to connect to, must fail
   mysql_db:
diff --git a/tests/integration/targets/test_mysql_db/tasks/issue-28.yml b/tests/integration/targets/test_mysql_db/tasks/issue-28.yml
index 74071e2..64fe9d5 100644
--- a/tests/integration/targets/test_mysql_db/tasks/issue-28.yml
+++ b/tests/integration/targets/test_mysql_db/tasks/issue-28.yml
@@ -52,12 +52,12 @@
     - assert:
         that:
           - result is failed
-      when: connector.name.0 is search('pymysql')
+      when: connector_name is search('pymysql')
 
     - assert:
         that:
           - result is succeeded
-      when: connector.name.0 is not search('pymysql')
+      when: connector_name is not search('pymysql')
 
     - name: attempt connection with newly created user ignoring hostname
       mysql_db:
diff --git a/tests/integration/targets/test_mysql_info/tasks/issue-28.yml b/tests/integration/targets/test_mysql_info/tasks/issue-28.yml
index ec2b493..bf4576f 100644
--- a/tests/integration/targets/test_mysql_info/tasks/issue-28.yml
+++ b/tests/integration/targets/test_mysql_info/tasks/issue-28.yml
@@ -54,12 +54,12 @@
     - assert:
         that:
           - result is failed
-      when: connector.name.0 is search('pymysql')
+      when: connector_name is search('pymysql')
 
     - assert:
         that:
           - result is succeeded
-      when: connector.name.0 is not search('pymysql')
+      when: connector_name is not search('pymysql')
 
     - name: attempt connection with newly created user ignoring hostname
       mysql_info:
diff --git a/tests/integration/targets/test_mysql_query/tasks/issue-28.yml b/tests/integration/targets/test_mysql_query/tasks/issue-28.yml
index 61f086e..a61e07f 100644
--- a/tests/integration/targets/test_mysql_query/tasks/issue-28.yml
+++ b/tests/integration/targets/test_mysql_query/tasks/issue-28.yml
@@ -54,12 +54,12 @@
     - assert:
         that:
           - result is failed
-      when: connector.name.0 is search('pymysql')
+      when: connector_name is search('pymysql')
 
     - assert:
         that:
           - result is succeeded
-      when: connector.name.0 is not search('pymysql')
+      when: connector_name is not search('pymysql')
 
     - name: attempt connection with newly created user ignoring hostname
       mysql_query:
diff --git a/tests/integration/targets/test_mysql_query/tasks/mysql_query_initial.yml b/tests/integration/targets/test_mysql_query/tasks/mysql_query_initial.yml
index 2d971ab..5bf379f 100644
--- a/tests/integration/targets/test_mysql_query/tasks/mysql_query_initial.yml
+++ b/tests/integration/targets/test_mysql_query/tasks/mysql_query_initial.yml
@@ -343,7 +343,7 @@
       that:
       # PyMySQL driver throws a warning, so the following is correct
       - result is not changed
-    when: connector.name.0 is search('pymysql')
+    when: connector_name is search('pymysql')
 
   # Issue https://github.com/ansible-collections/community.mysql/issues/268
   - assert:
@@ -352,7 +352,7 @@
       # if the state was changed or not.
       # We assume that it was for DDL queryes by default in the code
       - result is changed
-    when: connector.name.0 is search('mysqlclient')
+    when: connector_name is search('mysqlclient')
 
   - name: Drop db {{ test_db }}
     mysql_query:
diff --git a/tests/integration/targets/test_mysql_replication/tasks/issue-28.yml b/tests/integration/targets/test_mysql_replication/tasks/issue-28.yml
index 11e457b..e6333f0 100644
--- a/tests/integration/targets/test_mysql_replication/tasks/issue-28.yml
+++ b/tests/integration/targets/test_mysql_replication/tasks/issue-28.yml
@@ -55,12 +55,12 @@
     - assert:
         that:
           - result is failed
-      when: connector.name.0 is search('pymysql')
+      when: connector_name is search('pymysql')
 
     - assert:
         that:
           - result is succeeded
-      when: connector.name.0 is not search('pymysql')
+      when: connector_name is not search('pymysql')
 
     - name: attempt connection with newly created user ignoring hostname
       mysql_replication:
diff --git a/tests/integration/targets/test_mysql_replication/tasks/mysql_replication_initial.yml b/tests/integration/targets/test_mysql_replication/tasks/mysql_replication_initial.yml
index 8272307..78206fc 100644
--- a/tests/integration/targets/test_mysql_replication/tasks/mysql_replication_initial.yml
+++ b/tests/integration/targets/test_mysql_replication/tasks/mysql_replication_initial.yml
@@ -184,8 +184,8 @@
       shell: "echo \"INSERT INTO {{ test_table }} (id) VALUES (1), (2), (3); FLUSH LOGS;\" | {{ mysql_command }} -P{{ mysql_primary_port }} {{ test_db }}"
 
     - name: Small pause to be sure the bin log, which was flushed previously, reached the replica
-      pause:
-        seconds: 2
+      ansible.builtin.wait_for:
+        timeout: 2
 
     # Test primary log pos has been changed:
     - name: Get replica status
@@ -218,10 +218,12 @@
         fail_on_error: true
       register: result
 
+    # mysqlclient 2.0.1 always return "changed"
     - assert:
         that:
-        - result is not changed
-      when: (pymysql_version.stdout | default('1000', true)) is version('0.9.3', '<=')
+          - result is not changed
+      when:
+        - connector_name == 'pymysql'
 
     # Test stopreplica mode:
     - name: Stop replica
@@ -236,7 +238,12 @@
         - result is changed
         - result.queries == ["STOP SLAVE"] or result.queries == ["STOP REPLICA"]
 
+    - name: Pause for 2 seconds to let the replication stop
+      ansible.builtin.wait_for:
+        timeout: 2
+
     # Test stopreplica mode:
+    # mysqlclient 2.0.1 always return "changed"
     - name: Stop replica that is no longer running
       mysql_replication:
         <<: *mysql_params
@@ -247,8 +254,9 @@
 
     - assert:
         that:
-        - result is not changed
-      when: (pymysql_version.stdout | default('1000', true)) is version('0.9.3', '<=')
+          - result is not changed
+      when:
+        - connector_name == 'pymysql'
 
     # master / slave related choices were removed in 3.0.0
     # https://github.com/ansible-collections/community.mysql/pull/252
diff --git a/tests/integration/targets/test_mysql_user/tasks/issue-121.yml b/tests/integration/targets/test_mysql_user/tasks/issue-121.yml
index fb5bef6..7d789ef 100644
--- a/tests/integration/targets/test_mysql_user/tasks/issue-121.yml
+++ b/tests/integration/targets/test_mysql_user/tasks/issue-121.yml
@@ -9,8 +9,6 @@
   block:
 
     # ============================================================
-    - shell: pip show pymysql | awk '/Version/ {print $2}'
-      register: pymysql_version
 
     - name: get server certificate
       copy:
diff --git a/tests/integration/targets/test_mysql_user/tasks/issue-28.yml b/tests/integration/targets/test_mysql_user/tasks/issue-28.yml
index ae15865..d56965a 100644
--- a/tests/integration/targets/test_mysql_user/tasks/issue-28.yml
+++ b/tests/integration/targets/test_mysql_user/tasks/issue-28.yml
@@ -53,12 +53,12 @@
     - assert:
         that:
           - result is failed
-      when: connector.name.0 is search('pymysql')
+      when: connector_name is search('pymysql')
 
     - assert:
         that:
           - result is succeeded
-      when: connector.name.0 is not search('pymysql')
+      when: connector_name is not search('pymysql')
 
     - name: attempt connection with newly created user ignoring hostname
       mysql_user:
diff --git a/tests/integration/targets/test_mysql_user/tasks/test_user_plugin_auth.yml b/tests/integration/targets/test_mysql_user/tasks/test_user_plugin_auth.yml
index 3b95d17..a4884d8 100644
--- a/tests/integration/targets/test_mysql_user/tasks/test_user_plugin_auth.yml
+++ b/tests/integration/targets/test_mysql_user/tasks/test_user_plugin_auth.yml
@@ -356,12 +356,14 @@
     # plugins that are loaded by default are sha2*, but these aren't compatible with pymysql < 0.9, so skip these tests
     # for those versions.
     #
-    - name: Get pymysql version
-      shell: pip show pymysql | awk '/Version/ {print $2}'
-      register: pymysql_version
-
     - name: Test plugin auth switching which doesn't work on pymysql < 0.9
-      when: pymysql_version.stdout == "" or (pymysql_version.stdout != "" and pymysql_version.stdout is version('0.9', '>='))
+      when:
+        - >
+          connector_name is not search('pymysql')
+          or (
+            connector_name is search('pymysql')
+            and connector_ver is version('0.9', '>=')
+          )
       block:
 
       - name: Create user with plugin auth (empty auth string)
diff --git a/tests/integration/targets/test_mysql_variables/tasks/assert_fail_msg.yml b/tests/integration/targets/test_mysql_variables/tasks/assert_fail_msg.yml
index 4a840b9..e7e0885 100644
--- a/tests/integration/targets/test_mysql_variables/tasks/assert_fail_msg.yml
+++ b/tests/integration/targets/test_mysql_variables/tasks/assert_fail_msg.yml
@@ -22,4 +22,4 @@
 - name: assert message failure (expect failed=true)
   assert:
     that:
-      - "output.failed == true"
+      - "output.failed | bool == true"
diff --git a/tests/integration/targets/test_mysql_variables/tasks/assert_var.yml b/tests/integration/targets/test_mysql_variables/tasks/assert_var.yml
index 5419f34..704f069 100644
--- a/tests/integration/targets/test_mysql_variables/tasks/assert_var.yml
+++ b/tests/integration/targets/test_mysql_variables/tasks/assert_var.yml
@@ -22,7 +22,7 @@
 - name: assert output message changed value
   assert:
     that:
-      - "output.changed == {{ changed }}"
+      - "output.changed | bool == changed | bool"
 
 - name: run mysql command to show variable
   command: "{{ mysql_command }} \"-e show variables like '{{ var_name }}'\""
@@ -31,6 +31,6 @@
 - name: assert output mysql variable name and value
   assert:
     that:
-      - "result.changed == true"
+      - "result.changed | bool == true"
       - "'{{ var_name }}' in result.stdout"
       - "'{{ var_value }}' in result.stdout"
diff --git a/tests/integration/targets/test_mysql_variables/tasks/assert_var_output.yml b/tests/integration/targets/test_mysql_variables/tasks/assert_var_output.yml
index f84a468..01362ef 100644
--- a/tests/integration/targets/test_mysql_variables/tasks/assert_var_output.yml
+++ b/tests/integration/targets/test_mysql_variables/tasks/assert_var_output.yml
@@ -22,7 +22,7 @@
 - name: assert output message changed value
   assert:
     that:
-      - "output.changed == {{ changed }}"
+      - "output.changed | bool == changed | bool"
 
 - set_fact:
     key_name: "{{ var_name }}"
@@ -35,6 +35,6 @@
 - name: assert output variable info match mysql variable info
   assert:
     that:
-      - "result.changed == true"
+      - "result.changed | bool == true"
       - "key_name in result.stdout"
       - "key_value in result.stdout"
diff --git a/tests/integration/targets/test_mysql_variables/tasks/issue-28.yml b/tests/integration/targets/test_mysql_variables/tasks/issue-28.yml
index 93c2125..aa01ddb 100644
--- a/tests/integration/targets/test_mysql_variables/tasks/issue-28.yml
+++ b/tests/integration/targets/test_mysql_variables/tasks/issue-28.yml
@@ -51,12 +51,12 @@
     - assert:
         that:
           - result is failed
-      when: connector.name.0 is search('pymysql')
+      when: connector_name is search('pymysql')
 
     - assert:
         that:
           - result is succeeded
-      when: connector.name.0 is not search('pymysql')
+      when: connector_name is not search('pymysql')
 
     - name: attempt connection with newly created user ignoring hostname
       mysql_variables:
diff --git a/tests/integration/targets/test_mysql_variables/tasks/mysql_variables.yml b/tests/integration/targets/test_mysql_variables/tasks/mysql_variables.yml
index a857f12..ed34966 100644
--- a/tests/integration/targets/test_mysql_variables/tasks/mysql_variables.yml
+++ b/tests/integration/targets/test_mysql_variables/tasks/mysql_variables.yml
@@ -155,15 +155,15 @@
       mysql_variables:
         <<: *mysql_params
         variable: max_connect_errors
-        value: -1
+        value: '-1'
       register: oor_result
       ignore_errors: true
 
     - include: assert_var.yml changed=true output={{ oor_result }} var_name=max_connect_errors var_value=1
-      when: connector.name.0 is not search('pymysql')
+      when: connector_name is not search('pymysql')
 
     - include: assert_fail_msg.yml output={{ oor_result }}  msg='Truncated incorrect'
-      when: connector.name.0 is search('pymysql')
+      when: connector_name is search('pymysql')
 
     # ============================================================
     # Verify mysql_variable fails when setting an incorrect value (incorrect type)