diff --git a/config/general_config/featureset016.yml b/config/general_config/featureset016.yml
index 1583b86ec..40448b668 100644
--- a/config/general_config/featureset016.yml
+++ b/config/general_config/featureset016.yml
@@ -16,14 +16,13 @@ undercloud_generate_service_certificate: false
 ssl_overcloud: false
 
 tempest_config: false
-# TODO: enable pingtest when the job passes with some time left
-# before the time limit
-test_ping: false
+test_ping: true
 run_tempest: false
 step_introspect: false
 
 deploy_composable_scenario: true
 composable_scenario: scenario001-multinode-containers.yaml
+validate_template: scenario001-multinode.yaml
 
 # options below direct automatic doc generation by tripleo-collect-logs
 artcl_gen_docs: true
diff --git a/config/general_config/featureset017.yml b/config/general_config/featureset017.yml
index 5c4967091..dd0939aae 100644
--- a/config/general_config/featureset017.yml
+++ b/config/general_config/featureset017.yml
@@ -14,14 +14,16 @@ undercloud_generate_service_certificate: false
 ssl_overcloud: false
 
 tempest_config: false
-# TODO: enable pingtest when the job passes with some time left
-# before the time limit
+# TODO(emilien)
+# We're figuring out why Zaqar doesn't work but pingtest should
+# be enabled soon.
 test_ping: false
 run_tempest: false
 step_introspect: false
 
 deploy_composable_scenario: true
 composable_scenario: scenario002-multinode-containers.yaml
+validate_template: scenario002-multinode.yaml
 
 # options below direct automatic doc generation by tripleo-collect-logs
 artcl_gen_docs: true
diff --git a/config/general_config/featureset018.yml b/config/general_config/featureset018.yml
index aa95cc6fa..2e806bd5a 100644
--- a/config/general_config/featureset018.yml
+++ b/config/general_config/featureset018.yml
@@ -14,14 +14,13 @@ undercloud_generate_service_certificate: false
 ssl_overcloud: false
 
 tempest_config: false
-# TODO: enable pingtest when the job passes with some time left
-# before the time limit
-test_ping: false
+test_ping: true
 run_tempest: false
 step_introspect: false
 
 deploy_composable_scenario: true
 composable_scenario: scenario003-multinode-containers.yaml
+validate_template: scenario003-multinode.yaml
 
 # options below direct automatic doc generation by tripleo-collect-logs
 artcl_gen_docs: true
diff --git a/config/general_config/featureset019.yml b/config/general_config/featureset019.yml
index 86b64d3f8..df6976ecf 100644
--- a/config/general_config/featureset019.yml
+++ b/config/general_config/featureset019.yml
@@ -14,14 +14,16 @@ undercloud_generate_service_certificate: false
 ssl_overcloud: false
 
 tempest_config: false
-# TODO: enable pingtest when the job passes with some time left
-# before the time limit
+# TODO(emilien)
+# glance+swift+ceph-rgw doesn't work yet but we're investigating/
+# should be fixed soon
 test_ping: false
 run_tempest: false
 step_introspect: false
 
 deploy_composable_scenario: true
 composable_scenario: scenario004-multinode-containers.yaml
+validate_template: scenario004-multinode.yaml
 
 # options below direct automatic doc generation by tripleo-collect-logs
 artcl_gen_docs: true
diff --git a/doc/source/feature-configuration.rst b/doc/source/feature-configuration.rst
index f7bded142..e8a2db449 100644
--- a/doc/source/feature-configuration.rst
+++ b/doc/source/feature-configuration.rst
@@ -51,11 +51,11 @@ please consult the following `etherpad <https://etherpad.openstack.org/p/quickst
 +-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+-------------+------+---------+-------+-------+-------+-------+-------+-------+-------+-------+--------+------+----+----+
 | 015 |      |        |        |       |       |         |         |         |         |         | X        |             |      |         |       |       |       | X     |       |       |       |       | X      |      |    |    |
 +-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+-------------+------+---------+-------+-------+-------+-------+-------+-------+-------+-------+--------+------+----+----+
-| 016 |      |        |        |       |       |         |         |         |         | X       |          |             |      |         | X     |       |       |       |       |       |       |       | X      |      |    |    |
+| 016 |      |        |        |       |       |         |         |         |         | X       |          |             | X    |         | X     |       |       |       |       |       |       |       | X      |      |    |    |
 +-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+-------------+------+---------+-------+-------+-------+-------+-------+-------+-------+-------+--------+------+----+----+
 | 017 |      |        |        |       |       |         |         |         |         | X       |          |             |      |         |       | X     |       |       |       |       |       |       | X      |      |    |    |
 +-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+-------------+------+---------+-------+-------+-------+-------+-------+-------+-------+-------+--------+------+----+----+
-| 018 |      |        |        |       |       |         |         |         |         | X       |          |             |      |         |       |       | X     |       |       |       |       |       | X      |      |    |    |
+| 018 |      |        |        |       |       |         |         |         |         | X       |          |             | X    |         |       |       | X     |       |       |       |       |       | X      |      |    |    |
 +-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+-------------+------+---------+-------+-------+-------+-------+-------+-------+-------+-------+--------+------+----+----+
 | 019 |      |        |        |       |       |         |         |         |         | X       |          |             |      |         |       |       |       | X     |       |       |       |       | X      |      |    |    |
 +-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+-------------+------+---------+-------+-------+-------+-------+-------+-------+-------+-------+--------+------+----+----+