diff --git a/config/general_config/featureset017.yml b/config/general_config/featureset017.yml
index ee1cbe493..0aa46d26c 100644
--- a/config/general_config/featureset017.yml
+++ b/config/general_config/featureset017.yml
@@ -78,19 +78,16 @@ run_tempest: >-
   {%- endif -%}
 
 test_regex: ''
-tempest_whitelist:
-  # Testing zaqar doesn't work yet, but it's in progress
-  # - 'zaqar.tests.tempest_plugin.tests.v2.test_queues.TestManageQueue'
-  # Testing boot from volume and server connectivity
-  - 'tempest.scenario.test_volume_boot_pattern.TestVolumeBootPattern.test_volume_boot_pattern'
-  # Testing swift
-  - 'tempest.api.object_storage.test_object_services.ObjectTest'
-  # Testing cinder volumes encrypted by barbican:
-  - 'tempest.scenario.test_encrypted_cinder_volumes.TestEncryptedCinderVolumes'
-  # Testing telemetry autoscaling
-  - 'ceilometer.tests.tempest.scenario.test_telemetry_integration.TestTelemetryIntegration'
-  # TODO(emilien) run ec2api tests when ec2api is supported in python-tempestconf
-  # - 'ec2api.tests.functional.api.test_key_pairs.KeyPairTest'
+
+# TODO(emilien) run ec2api tests when ec2api is supported in python-tempestconf
+# 'ec2api.tests.functional.api.test_key_pairs.KeyPairTest'
+tempest_whitelist: >-
+    {% if release not in ['newton', 'ocata', 'pike'] -%}
+    ["tempest.scenario.test_volume_boot_pattern.TestVolumeBootPattern.test_volume_boot_pattern", "tempest.api.object_storage.test_object_services.ObjectTest", "tempest.scenario.test_encrypted_cinder_volumes.TestEncryptedCinderVolumes", "ceilometer.tests.tempest.scenario.test_telemetry_integration.TestTelemetryIntegration"]
+    {%- else -%}
+    ["tempest.scenario.test_volume_boot_pattern.TestVolumeBootPattern.test_volume_boot_pattern", "tempest.api.object_storage.test_object_services.ObjectTest"]
+    {%- endif -%}
+
 tempest_plugins:
   - python-aodh-tests
   - python-ceilometer-tests