diff --git a/changelogs/fragments/tempfile.yml b/changelogs/fragments/tempfile.yml
new file mode 100644
index 00000000000..35bf5b3cbd5
--- /dev/null
+++ b/changelogs/fragments/tempfile.yml
@@ -0,0 +1,2 @@
+minor_changes:
+  - tempfile - Remove unnecessary conditional for creating a temporary directory.
diff --git a/lib/ansible/modules/tempfile.py b/lib/ansible/modules/tempfile.py
index ff70ae80e5a..8c60cd2da74 100644
--- a/lib/ansible/modules/tempfile.py
+++ b/lib/ansible/modules/tempfile.py
@@ -101,7 +101,7 @@ def main():
                 dir=module.params['path'],
             )
             close(handle)
-        elif module.params['state'] == 'directory':
+        else:
             path = mkdtemp(
                 prefix=module.params['prefix'],
                 suffix=module.params['suffix'],
diff --git a/test/integration/targets/tempfile/aliases b/test/integration/targets/tempfile/aliases
new file mode 100644
index 00000000000..a6dafcf8cd8
--- /dev/null
+++ b/test/integration/targets/tempfile/aliases
@@ -0,0 +1 @@
+shippable/posix/group1
diff --git a/test/integration/targets/tempfile/meta/main.yml b/test/integration/targets/tempfile/meta/main.yml
new file mode 100644
index 00000000000..1810d4bec98
--- /dev/null
+++ b/test/integration/targets/tempfile/meta/main.yml
@@ -0,0 +1,2 @@
+dependencies:
+  - setup_remote_tmp_dir
diff --git a/test/integration/targets/tempfile/tasks/main.yml b/test/integration/targets/tempfile/tasks/main.yml
new file mode 100644
index 00000000000..2d783e6f9a9
--- /dev/null
+++ b/test/integration/targets/tempfile/tasks/main.yml
@@ -0,0 +1,63 @@
+- name: Create a temporary file with defaults
+  tempfile:
+  register: temp_file_default
+
+- name: Create a temporary directory with defaults
+  tempfile:
+    state: directory
+  register: temp_dir_default
+
+- name: Create a temporary file with optional parameters
+  tempfile:
+    path: "{{ remote_tmp_dir }}"
+    prefix: hello.
+    suffix: .goodbye
+  register: temp_file_options
+
+- name: Create a temporary directory with optional parameters
+  tempfile:
+    state: directory
+    path: "{{ remote_tmp_dir }}"
+    prefix: hello.
+    suffix: .goodbye
+  register: temp_dir_options
+
+- name: Create a temporary file in a non-existent directory
+  tempfile:
+    path: "{{ remote_tmp_dir }}/does_not_exist"
+  register: temp_file_non_existent_path
+  ignore_errors: yes
+
+- name: Create a temporary directory in a non-existent directory
+  tempfile:
+    state: directory
+    path: "{{ remote_tmp_dir }}/does_not_exist"
+  register: temp_dir_non_existent_path
+  ignore_errors: yes
+
+- name: Check results
+  assert:
+    that:
+      - temp_file_default is changed
+      - temp_file_default.state == 'file'
+      - temp_file_default.path | basename | split('.') | first == 'ansible'
+
+      - temp_dir_default is changed
+      - temp_dir_default.state == 'directory'
+      - temp_dir_default.path | basename | split('.') | first == 'ansible'
+
+      - temp_file_options is changed
+      - temp_file_options.state == 'file'
+      - temp_file_options.path.startswith(remote_tmp_dir)
+      - temp_file_options.path | basename | split('.') | first == 'hello'
+      - temp_file_options.path | basename | split('.') | last == 'goodbye'
+
+      - temp_dir_options is changed
+      - temp_dir_options.state == 'directory'
+      - temp_dir_options.path.startswith(remote_tmp_dir)
+      - temp_dir_options.path | basename | split('.') | first == 'hello'
+      - temp_dir_options.path | basename | split('.') | last == 'goodbye'
+
+      - temp_file_non_existent_path is failed
+
+      - temp_dir_non_existent_path is failed