diff --git a/tests/integration/targets/test_mysql_user/tasks/main.yml b/tests/integration/targets/test_mysql_user/tasks/main.yml
index 06424f5..5316715 100644
--- a/tests/integration/targets/test_mysql_user/tasks/main.yml
+++ b/tests/integration/targets/test_mysql_user/tasks/main.yml
@@ -241,4 +241,4 @@
     # https://github.com/ansible-collections/community.mysql/issues/231
     - include: test_user_grants_with_roles_applied.yml
 
-    - include: revoke_only_grant.yml
\ No newline at end of file
+    - include: test_revoke_only_grant.yml
diff --git a/tests/integration/targets/test_mysql_user/tasks/revoke_only_grant.yml b/tests/integration/targets/test_mysql_user/tasks/test_revoke_only_grant.yml
similarity index 61%
rename from tests/integration/targets/test_mysql_user/tasks/revoke_only_grant.yml
rename to tests/integration/targets/test_mysql_user/tasks/test_revoke_only_grant.yml
index 19b9b6a..2420989 100644
--- a/tests/integration/targets/test_mysql_user/tasks/revoke_only_grant.yml
+++ b/tests/integration/targets/test_mysql_user/tasks/test_revoke_only_grant.yml
@@ -3,17 +3,12 @@
     mysql_parameters: &mysql_params
       login_user: '{{ mysql_user }}'
       login_password: '{{ mysql_password }}'
-      login_host: 127.0.0.1
+      login_host: '{{ mysql_host }}'
       login_port: '{{ mysql_primary_port }}'
   block:
-    - name: Drop mysql user if exists
-      mysql_user:
-        <<: *mysql_params
-        name: '{{ user_name_1 }}'
-        state: absent
-      ignore_errors: true
+    - include: utils_remove_user.yml user_name={{ user_name_1 }}
 
-    - name: create user with two grants
+    - name: Revoke only grants | Create user with two grants
       mysql_user:
         <<: *mysql_params
         name: "{{ user_name_1 }}"
@@ -21,7 +16,7 @@
         update_password: on_create
         priv: '*.*:SELECT,GRANT'
 
-    - name: user must have only on priv, grant priv must be dropped
+    - name: Revoke only grants | Revoke grant priv from db_user1
       register: result
       mysql_user:
         <<: *mysql_params
@@ -30,12 +25,13 @@
         update_password: on_create
         priv: '*.*:SELECT'
 
-    - assert:
+    - name: Revoke only grants | Assert that db_user1 only have one priv left
+      assert:
         that:
           - result is not failed
           - result is changed
 
-    - name: immutable - user must have only on priv, grant priv must be dropped
+    - name: Revoke only grants | Update db_user1 again to test idempotence
       register: result
       mysql_user:
         <<: *mysql_params
@@ -44,15 +40,11 @@
         update_password: on_create
         priv: '*.*:SELECT'
 
-    - assert:
+    - name: Revoke only grants | Assert that task is idempotent
+      assert:
         that:
-          - result is not failed
+          - result is succeeded
           - result is not changed
 
   always:
-    - name: drop user
-      mysql_user:
-        <<: *mysql_params
-        name: '{{ user_name_1 }}'
-        state: absent
-      ignore_errors: true
+    - include: utils_remove_user.yml user_name={{ user_name_1 }}