diff --git a/changelogs/fragments/suse_distro_names.yaml b/changelogs/fragments/suse_distro_names.yaml
new file mode 100644
index 0000000000..e0c17f9d7e
--- /dev/null
+++ b/changelogs/fragments/suse_distro_names.yaml
@@ -0,0 +1,3 @@
+bugfixes:
+    - Add code to detect correctly a host running openSUSE Tumbleweed
+    - Fix detection string for SUSE distribution variants like Leap and SLES (SUSE Enterprise Linux Server).
diff --git a/lib/ansible/modules/system/hostname.py b/lib/ansible/modules/system/hostname.py
index ef0710dc9e..89560a103e 100644
--- a/lib/ansible/modules/system/hostname.py
+++ b/lib/ansible/modules/system/hostname.py
@@ -565,7 +565,7 @@ class FedoraHostname(Hostname):
 
 class SLESHostname(Hostname):
     platform = 'Linux'
-    distribution = 'Suse linux enterprise server '
+    distribution = 'Sles'
     try:
         distribution_version = get_distribution_version()
         # cast to float may raise ValueError on non SLES, we use float for a little more safety over int
@@ -579,7 +579,13 @@ class SLESHostname(Hostname):
 
 class OpenSUSEHostname(Hostname):
     platform = 'Linux'
-    distribution = 'Opensuse '
+    distribution = 'Opensuse leap'
+    strategy_class = SystemdStrategy
+
+
+class TumbleweedHostname(Hostname):
+    platform = 'Linux'
+    distribution = 'Opensuse tumbleweed'
     strategy_class = SystemdStrategy