diff --git a/plans/provision/virtual.fmf b/plans/provision/virtual.fmf
index 89038b0d80..77de744f8a 100644
--- a/plans/provision/virtual.fmf
+++ b/plans/provision/virtual.fmf
@@ -6,7 +6,8 @@ description: |
     even if not directly related to the provision implementation.
 
     The plan takes care of fetching the image to speed up the
-    execution. Each test should consume the `PROVISION_METHODS`
+    execution. Each test should set the `provision-virtual` tag to
+    get picked by the plan, consume the `PROVISION_METHODS`
     variable and use `provision --how virtual` on their own.
 
 discover:
diff --git a/tests/core/escaping/test.sh b/tests/core/escaping/test.sh
index 4bc60d442a..34a2d85db2 100755
--- a/tests/core/escaping/test.sh
+++ b/tests/core/escaping/test.sh
@@ -8,7 +8,7 @@ rlJournalStart
 
     for method in ${PROVISION_METHODS:-local}; do
         rlPhaseStartTest "Test ($method)"
-            rlRun "tmt run -arvvvddd provision -h $method"
+            rlRun "tmt run -arvvv provision -h $method"
         rlPhaseEnd
     done
 
diff --git a/tests/core/spaces/main.fmf b/tests/core/spaces/main.fmf
index 1481b69cd4..fbf599a3a4 100644
--- a/tests/core/spaces/main.fmf
+++ b/tests/core/spaces/main.fmf
@@ -5,11 +5,7 @@ description:
 test: ./test.sh
 framework: beakerlib
 tag-: [container, virtual]
+tag+: [provision-virtual]
 
 environment:
     PROVISION_METHODS: local container
-adjust:
-  - when: how == full
-    environment:
-        PROVISION_METHODS: container virtual local
-    tag+: [additional_coverage]
diff --git a/tests/execute/duration/main.fmf b/tests/execute/duration/main.fmf
index 495e555048..a5e309f0d5 100644
--- a/tests/execute/duration/main.fmf
+++ b/tests/execute/duration/main.fmf
@@ -2,11 +2,4 @@ summary: Verify that the test duration is correctly handled
 environment:
     PROVISION_METHODS: "local container"
 duration: 20m
-
-adjust:
-    when: how == full
-    environment:
-        PROVISION_METHODS: "local container virtual"
-    duration: 30m
-    because: with full virtualization more methods can be tested
-    tag+: [additional_coverage]
+tag+: [provision-virtual]
diff --git a/tests/execute/reboot/main.fmf b/tests/execute/reboot/main.fmf
index 9ee3de01b9..58cf847a02 100644
--- a/tests/execute/reboot/main.fmf
+++ b/tests/execute/reboot/main.fmf
@@ -8,15 +8,11 @@ tier: 4
 /out-of-session:
     summary: Verify that reboot induced from outside of test session works
     test: ./out-of-session.sh
+    tag+: [provision-virtual]
 
     environment+:
         PROVISION_METHODS: container
 
-    adjust+:
-        - when: how==full
-          environment+:
-            PROVISION_METHODS: container virtual
-
 # Disabled until the testing environment 'hardware specification' can be set.
 # https://tmt.readthedocs.io/en/stable/spec/plans.html#hardware
 /efi:
diff --git a/tests/execute/tty/main.fmf b/tests/execute/tty/main.fmf
index 200960ec96..751e17c0fe 100644
--- a/tests/execute/tty/main.fmf
+++ b/tests/execute/tty/main.fmf
@@ -1,9 +1,5 @@
 summary: Verify TTY handling in test environment
+tag+: [provision-virtual]
 
 environment:
     PROVISION_METHODS: local container
-adjust:
-  - when: how == full
-    environment:
-        PROVISION_METHODS: local container virtual
-    tag+: [additional_coverage]
diff --git a/tests/finish/ansible/main.fmf b/tests/finish/ansible/main.fmf
index 1ae5ba0a3d..ff75d24613 100644
--- a/tests/finish/ansible/main.fmf
+++ b/tests/finish/ansible/main.fmf
@@ -5,6 +5,7 @@ description:
     environment variables are correctly handed over and logs are
     pulled back. In the full testing mode check virtual and local
     provision method as well.
+tag+: [provision-virtual]
 
 # By default we run under a container only
 environment:
@@ -14,8 +15,3 @@ adjust:
     environment:
         PROVISION_METHODS: container local
     because: the pipeline does not support nested virtualization
-  - when: how == full
-    environment:
-        PROVISION_METHODS: container virtual local
-    because: local/virtual provision needs root/full virtualization
-    tag+: [additional_coverage]
diff --git a/tests/login/main.fmf b/tests/login/main.fmf
index 65431370c2..658c91a962 100644
--- a/tests/login/main.fmf
+++ b/tests/login/main.fmf
@@ -21,10 +21,6 @@
 /ready:
     summary: Try to log into guest to verify property is_ready
     test: ./ready.sh
+    tag+: [provision-virtual]
     environment:
         PROVISION_METHODS: local container
-    adjust:
-      - when: how == full
-        environment:
-            PROVISION_METHODS: local container virtual
-        tag+: [additional_coverage]
diff --git a/tests/prepare/ansible/main.fmf b/tests/prepare/ansible/main.fmf
index 74dda5d623..45feac7972 100644
--- a/tests/prepare/ansible/main.fmf
+++ b/tests/prepare/ansible/main.fmf
@@ -4,6 +4,7 @@ description:
     centos) and prepare it with an ansible playbook. Make sure the
     environment variables are correctly handed over. In the full
     testing mode check virtual and local provision method as well.
+tag+: [provision-virtual]
 
 # By default we run under a container only
 environment:
@@ -13,8 +14,3 @@ adjust:
     environment:
         PROVISION_METHODS: container local
     because: the pipeline does not support nested virtualization
-  - when: how == full
-    environment:
-        PROVISION_METHODS: container virtual local
-    because: local/virtual provision needs root/full virtualization
-    tag+: [additional_coverage]
diff --git a/tests/prepare/install/main.fmf b/tests/prepare/install/main.fmf
index a5c085d97a..67d34b0b6b 100644
--- a/tests/prepare/install/main.fmf
+++ b/tests/prepare/install/main.fmf
@@ -4,6 +4,7 @@ description:
     Make sure that special characters are correctly escaped.
     Verify that installation from copr works for epel7. Exercises
     all provision methods in full mode, container only by default.
+tag+: [provision-virtual]
 environment:
     PROVISION_METHODS: container
 adjust:
@@ -11,8 +12,3 @@ adjust:
     environment:
         PROVISION_METHODS: container local
     because: the pipeline does not support nested virtualization
-  - when: how == full
-    environment:
-        PROVISION_METHODS: container virtual local
-    because: local/virtual provision needs root/full virtualization
-    tag+: [additional_coverage]
diff --git a/tests/prepare/multihost/main.fmf b/tests/prepare/multihost/main.fmf
index ae32067cf4..b0b7c00971 100644
--- a/tests/prepare/multihost/main.fmf
+++ b/tests/prepare/multihost/main.fmf
@@ -1,4 +1,5 @@
 summary: Check that requirement installation is guest-aware in multihost scenario
+tag+: [provision-virtual]
 
 environment:
     PROVISION_METHODS: container
@@ -8,9 +9,3 @@ adjust:
     environment:
         PROVISION_METHODS: container
     because: the pipeline does not support nested virtualization
-
-  - when: how == full
-    environment:
-        PROVISION_METHODS: container virtual
-    because: local/virtual provision needs root/full virtualization
-    tag+: [additional_coverage]
diff --git a/tests/prepare/recommend/main.fmf b/tests/prepare/recommend/main.fmf
index c93452e96f..c591ebc6da 100644
--- a/tests/prepare/recommend/main.fmf
+++ b/tests/prepare/recommend/main.fmf
@@ -3,6 +3,7 @@ description:
     Run a simple test which recommends two packages. Check that
     the existing one is installed and the other one is ignored. No
     error should be reported.
+tag+: [provision-virtual]
 environment:
     PROVISION_METHODS: container
 adjust:
@@ -10,8 +11,3 @@ adjust:
     environment:
         PROVISION_METHODS: container local
     because: the pipeline does not support nested virtualization
-  - when: how == full
-    environment:
-        PROVISION_METHODS: container virtual local
-    because: local/virtual provision needs root/full virtualization
-    tag+: [additional_coverage]
diff --git a/tests/provision/facts/main.fmf b/tests/provision/facts/main.fmf
index f879699793..fcce6ecf40 100644
--- a/tests/provision/facts/main.fmf
+++ b/tests/provision/facts/main.fmf
@@ -1,6 +1,7 @@
 /guest:
     summary: Check that guest facts are discovered and reported correctly
     test: ./test-guest.sh
+    tag+: [provision-virtual]
 
     environment:
         PROVISION_METHODS: local container
diff --git a/tests/provision/reboot/main.fmf b/tests/provision/reboot/main.fmf
index c850a5c7ba..fef9a20111 100644
--- a/tests/provision/reboot/main.fmf
+++ b/tests/provision/reboot/main.fmf
@@ -1,4 +1,5 @@
 summary: Check that the reboot command works
+tag+: [provision-virtual]
 
 environment:
     PROVISION_METHODS: container
@@ -6,7 +7,7 @@ environment:
 adjust:
   - when: how == full
     environment:
-        PROVISION_METHODS: container connect virtual
+        PROVISION_METHODS: container connect
     tag+: [additional_coverage]
 
   - when: how == beaker
diff --git a/tests/pull/results/main.fmf b/tests/pull/results/main.fmf
index b693cf3a5d..91d72e75ce 100644
--- a/tests/pull/results/main.fmf
+++ b/tests/pull/results/main.fmf
@@ -3,11 +3,7 @@ description:
     Check that test logs are correctly fetched from the guest,
     test results are stored into `results.yaml` and plan data
     directory content is synced back.
+tag+: [provision-virtual]
 
 environment:
     PROVISION_METHODS: container local
-adjust:
-  - when: how == full
-    environment:
-        PROVISION_METHODS: container virtual local
-    tag+: [additional_coverage]
diff --git a/tests/pull/simple/main.fmf b/tests/pull/simple/main.fmf
index 2b0ef6855e..ef16704b4f 100644
--- a/tests/pull/simple/main.fmf
+++ b/tests/pull/simple/main.fmf
@@ -3,13 +3,9 @@ description:
     Make sure that provisioning a guest and clean it up works as
     expected even if no preparation, test execution or finish step
     scripts are performed.
+tag+: [provision-virtual]
 link:
   - verifies: https://github.com/teemtee/tmt/issues/1011
 
 environment:
     PROVISION_METHODS: container local
-adjust:
-  - when: how == full
-    environment:
-        PROVISION_METHODS: container virtual local
-    tag+: [additional_coverage]
diff --git a/tests/run/worktree/main.fmf b/tests/run/worktree/main.fmf
index b728542518..db8d105690 100644
--- a/tests/run/worktree/main.fmf
+++ b/tests/run/worktree/main.fmf
@@ -9,6 +9,7 @@ description:
     against `local` and during `full` testing using `virtual` as
     well.
 require+: [tmt+provision-container]
+tag+: [provision-virtual]
 
 environment:
     PROVISION_METHODS: 'container'
@@ -16,9 +17,3 @@ adjust:
   - environment:
         PROVISION_METHODS: 'container local'
     when: trigger == commit
-  - environment:
-        PROVISION_METHODS: 'container local virtual'
-    result: xfail # issue 964
-    duration: 10m
-    when: how == full
-    tag+: [additional_coverage]
diff --git a/tests/security/ansible/main.fmf b/tests/security/ansible/main.fmf
index c59b3fb851..ef3e5e427a 100644
--- a/tests/security/ansible/main.fmf
+++ b/tests/security/ansible/main.fmf
@@ -1,5 +1,6 @@
 summary: Check whether an injected shell code is executed
 tier: 4
+tag+: [provision-virtual]
 
 # By default, we run under a container only
 environment:
@@ -9,8 +10,3 @@ adjust:
     environment:
         PROVISION_METHODS: container local
     because: the pipeline does not support nested virtualization
-  - when: how == full
-    environment:
-        PROVISION_METHODS: container virtual local
-    because: local/virtual provision needs root/full virtualization
-    tag+: [additional_coverage]
diff --git a/tests/test/check/main.fmf b/tests/test/check/main.fmf
index 446b435fb1..58c952c787 100644
--- a/tests/test/check/main.fmf
+++ b/tests/test/check/main.fmf
@@ -1,5 +1,6 @@
 summary: Test test checks
 tier: 2
+tag+: [provision-virtual]
 
 /dmesg:
   test: ./test-dmesg.sh
@@ -7,20 +8,8 @@ tier: 2
   environment:
       PROVISION_METHODS: local container
 
-  adjust:
-    - when: how == full
-      environment:
-          PROVISION_METHODS: local container virtual
-      tag+: [additional_coverage]
-
 /avc:
   test: ./test-avc.sh
 
   environment:
       PROVISION_METHODS: local
-
-  adjust:
-    - when: how == full
-      environment:
-          PROVISION_METHODS: local virtual
-      tag+: [additional_coverage]
diff --git a/tests/test/debug/main.fmf b/tests/test/debug/main.fmf
index c5e9042dfe..bcfd98a2b6 100644
--- a/tests/test/debug/main.fmf
+++ b/tests/test/debug/main.fmf
@@ -2,11 +2,7 @@ summary: Verify that test debugging works fine
 description:
     Prepare the environment for testing using provision & prepare,
     then debug test code using repeated discover & execute.
+tag+: [provision-virtual]
 
 environment:
     PROVISION_METHODS: local container
-adjust:
-    environment:
-        PROVISION_METHODS: local container virtual
-    when: how == full
-    tag+: [additional_coverage]