PR 1236 remake

Re-create #1236 (the part related to core virt-test), to help @jferlan with the task of re-creating the PRs.