diff --git a/tests/roles/bootstrap-host/tasks/prepare_hostname.yml b/tests/roles/bootstrap-host/tasks/prepare_hostname.yml
index 415b54dafd..262fb9129a 100644
--- a/tests/roles/bootstrap-host/tasks/prepare_hostname.yml
+++ b/tests/roles/bootstrap-host/tasks/prepare_hostname.yml
@@ -30,18 +30,5 @@
     backup: yes
 
 - name: Ensure hostname is set
-  block:
-    - name: Set hostname using the Ansible module
-      hostname:
-        name: aio1
-  # NOTE(hwoarang) The hostname module does not work on Leap 15 because of
-  # https://bugzilla.novell.com/show_bug.cgi?id=997614
-  # As such we need to fallback to using the command directly.
-  # NOTE(evrardjp): Remove this when Ansible 2.8 is out, as Ansible now
-  # vendors in the distro python package, which _should_ technically help.
-  # (To be tested)
-  rescue:
-    - name: Set hostname using hostnamectl
-      command: hostnamectl set-hostname aio1
-  tags:
-    - skip_ansible_lint
+  hostname:
+    name: aio1