diff --git a/defaults/main.yml b/defaults/main.yml
index dcfbf148..4a65fd40 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -94,7 +94,8 @@ tempest_test_blacklist_file_path: "{{ tempest_workspace }}/etc/tempest_blacklist
 # This sets up a list of tests to execute based on what's deployed in the environment.
 # The list gets added to the whitelist which tempest executes.
 tempest_test_whitelist:
-  - "tempest.api.identity.admin.v3"
+  - "{{ (ansible_pkg_mgr == 'apt' and tempest_install_method == 'distro') |
+         ternary('(?!.*\\.test_list_all_implied_roles)', '') ~ 'tempest.api.identity.admin.v3' }}"
   - "tempest.api.identity.v3"
   - "{{ (tempest_service_available_ceilometer | bool) | ternary('tempest.api.telemetry', '') }}"
   - "{{ (tempest_service_available_heat | bool) | ternary('tempest.api.orchestration.stacks.test_non_empty_stack', '') }}"
diff --git a/vars/ubuntu.yml b/vars/ubuntu.yml
index a2ff744e..92895001 100644
--- a/vars/ubuntu.yml
+++ b/vars/ubuntu.yml
@@ -23,4 +23,5 @@ tempest_distro_packages:
 
 tempest_service_distro_packages:
   - tempest
+  - python-junitxml
   - python-subunit