diff --git a/inventory/group_vars/utility_all.yml b/inventory/group_vars/utility_all.yml
index 288ebdfca1..3ad904e079 100644
--- a/inventory/group_vars/utility_all.yml
+++ b/inventory/group_vars/utility_all.yml
@@ -89,8 +89,5 @@ tempest_test_includelist:
   - "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', '') }}"
-  # TODO(odyssey4me):
-  # Once the issue with this test is worked out, re-enable it.
-  #- "{{ (tempest_service_available_nova | bool) | ternary('tempest.scenario.test_minimum_basic', '') }}"
   - "{{ (tempest_service_available_nova | bool) | ternary('tempest.scenario.test_server_basic_ops', '') }}"
   - "{{ (tempest_service_available_swift | bool) | ternary('tempest.scenario.test_object_storage_basic_ops', '') }}"
diff --git a/tests/roles/bootstrap-host/templates/user_variables.aio.yml.j2 b/tests/roles/bootstrap-host/templates/user_variables.aio.yml.j2
index dd433e9ba8..f44af0bf81 100644
--- a/tests/roles/bootstrap-host/templates/user_variables.aio.yml.j2
+++ b/tests/roles/bootstrap-host/templates/user_variables.aio.yml.j2
@@ -299,4 +299,9 @@ cinder_backends:
       - low-iops
       - high-iops
       - ultra-high-iops
+
+{%   if 'cinder' in bootstrap_host_scenarios %}
+tempest_test_includelist:
+  - tempest.scenario.test_minimum_basic.TestMinimumBasicScenario.test_minimum_basic_scenario
+{%   endif %}
 {% endif %}