diff --git a/defaults/main.yml b/defaults/main.yml
index cfa9a2ac..254c649a 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -165,8 +165,8 @@ tempest_plugin_zun_git_install_branch: master
 tempest_workspace: "{{ ansible_facts['env']['HOME'] }}/workspace"
 
 # The location where the test include/exclude lists will be placed
-tempest_test_includelist_file_path: "{{ tempest_workspace }}/etc/tempest_includelist.txt"
-tempest_test_excludelist_file_path: "{{ tempest_workspace }}/etc/tempest_excludelist.txt"
+tempest_includelist_file_path: "{{ tempest_workspace }}/etc/tempest_includelist.txt"
+tempest_excludelist_file_path: "{{ tempest_workspace }}/etc/tempest_excludelist.txt"
 
 # Tests to execute:
 # This sets up a list of tests to execute based on what's deployed in the environment.
diff --git a/releasenotes/notes/rename-list-file-path-239294e5a57fef09.yaml b/releasenotes/notes/rename-list-file-path-239294e5a57fef09.yaml
new file mode 100644
index 00000000..76ec906d
--- /dev/null
+++ b/releasenotes/notes/rename-list-file-path-239294e5a57fef09.yaml
@@ -0,0 +1,7 @@
+---
+upgrade:
+  - |
+    The variables `tempest_test_includelist_file_path` and `tempest_test_excludelist_file_path`
+    are renamed to `tempest_includelist_file_path` and `tempest_excludelist_file_path`.
+    Any overrides using these variables should be updated to account for the
+    new variable names.
diff --git a/tasks/tempest_post_install.yml b/tasks/tempest_post_install.yml
index f832a953..ae994e9e 100644
--- a/tasks/tempest_post_install.yml
+++ b/tasks/tempest_post_install.yml
@@ -163,7 +163,7 @@
       {{ item }}
       {%   endif %}
       {% endfor %}
-    dest: "{{ tempest_test_includelist_file_path }}"
+    dest: "{{ tempest_includelist_file_path }}"
     mode: "0644"
   when:
     - tempest_test_includelist | length > 0
@@ -180,7 +180,7 @@
       {{ item }}
       {%   endif %}
       {% endfor %}
-    dest: "{{ tempest_test_excludelist_file_path }}"
+    dest: "{{ tempest_excludelist_file_path }}"
     mode: "0644"
   when:
     - tempest_test_excludelist | length > 0
diff --git a/tasks/tempest_run.yml b/tasks/tempest_run.yml
index 493351c0..5c74a5f6 100644
--- a/tasks/tempest_run.yml
+++ b/tasks/tempest_run.yml
@@ -32,9 +32,9 @@
           --worker-file {{ tempest_test_worker_file_path }} \
         {% endif %}
         {% if tempest_test_excludelist | length > 0 %}
-          --exclude-list {{ tempest_test_excludelist_file_path }} \
+          --exclude-list {{ tempest_excludelist_file_path }} \
         {% endif %}
-          --include-list {{ tempest_test_includelist_file_path }} > {{ tempest_log_dir }}/tempest_run.log
+          --include-list {{ tempest_includelist_file_path }} > {{ tempest_log_dir }}/tempest_run.log
       args:
         chdir: "{{ tempest_workspace }}"
         executable: /bin/bash
@@ -109,9 +109,9 @@
         . {{ tempest_venv_bin }}/activate
         fi
         tempest run \
-          --include-list {{ tempest_test_includelist_file_path }} \
+          --include-list {{ tempest_includelist_file_path }} \
         {% if tempest_test_excludelist | length > 0 %}
-          --exclude-list {{ tempest_test_excludelist_file_path }} \
+          --exclude-list {{ tempest_excludelist_file_path }} \
         {% endif %}
           --list-tests &> {{ tempest_log_dir }}/test_list.txt
       args: