diff --git a/src/tests/ftest/avocado_tests.py b/src/tests/ftest/avocado_tests.py
old mode 100755
new mode 100644
index 75fe7ded542..0a2c12a8859
--- a/src/tests/ftest/avocado_tests.py
+++ b/src/tests/ftest/avocado_tests.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python3
 """
   (C) Copyright 2020-2023 Intel Corporation.
 
@@ -41,8 +40,10 @@ def tearDown(self):
     def test_junit_stdio(self):
         """Test full Stdout in Jenkins JUnit display
 
+        :avocado: tags=manual
+        :avocado: tags=vm
         :avocado: tags=avocado_tests,avocado_junit_stdout
-        :avocado: tags=test_junit_stdio
+        :avocado: tags=ApricotTests,test_junit_stdio
         """
         with open('large_stdout.txt', 'r') as inp:
             print(inp.read())
@@ -51,9 +52,10 @@ def test_junit_stdio(self):
     def test_teardown_timeout_timed_out(self):
         """Test the PoC tearDown() timeout patch
 
+        :avocado: tags=manual
+        :avocado: tags=vm
         :avocado: tags=avocado_tests,avocado_test_teardown_timeout
-        :avocado: tags=avocado_test_teardown_timeout_timed_out
-        :avocado: tags=test_teardown_timeout_timed_out
+        :avocado: tags=ApricotTests,test_teardown_timeout_timed_out
         """
         self.log.debug("Sleeping for 10 seconds")
         time.sleep(10)
@@ -61,8 +63,10 @@ def test_teardown_timeout_timed_out(self):
     def test_teardown_timeout(self):
         """Test the PoC tearDown() timeout patch
 
+        :avocado: tags=manual
+        :avocado: tags=vm
         :avocado: tags=avocado_tests,avocado_test_teardown_timeout
-        :avocado: tags=test_teardown_timeout
+        :avocado: tags=ApricotTests,test_teardown_timeout
         """
         self.log.debug("Sleeping for 1 second")
         time.sleep(1)
diff --git a/src/tests/ftest/cart/corpc/corpc_five_node.py b/src/tests/ftest/cart/corpc/corpc_five_node.py
index 261df5b050e..fbd262ccdff 100644
--- a/src/tests/ftest/cart/corpc/corpc_five_node.py
+++ b/src/tests/ftest/cart/corpc/corpc_five_node.py
@@ -13,12 +13,13 @@ class CartCoRpcFiveNodeTest(CartTest):
     :avocado: recursive
     """
 
-    def test_cart_corpc(self):
+    def test_cart_corpc_five_node(self):
         """Test CaRT CoRPC.
 
         :avocado: tags=all,pr,daily_regression
+        :avocado: tags=vm
         :avocado: tags=cart,corpc,five_node,memcheck
-        :avocado: tags=test_cart_corpc
+        :avocado: tags=CartCoRpcFiveNodeTest,test_cart_corpc_five_node
         """
         cmd = self.build_cmd(self.env, "test_servers")
         self.launch_test(cmd)
diff --git a/src/tests/ftest/cart/corpc/corpc_one_node.py b/src/tests/ftest/cart/corpc/corpc_one_node.py
index 40ff1c06406..3b339de4201 100644
--- a/src/tests/ftest/cart/corpc/corpc_one_node.py
+++ b/src/tests/ftest/cart/corpc/corpc_one_node.py
@@ -13,12 +13,13 @@ class CartCoRpcOneNodeTest(CartTest):
     :avocado: recursive
     """
 
-    def test_cart_corpc(self):
+    def test_cart_corpc_one_node(self):
         """Test CaRT CoRPC.
 
         :avocado: tags=all,pr,daily_regression
+        :avocado: tags=vm
         :avocado: tags=cart,corpc,one_node,memcheck
-        :avocado: tags=test_cart_corpc
+        :avocado: tags=CartCoRpcOneNodeTest,test_cart_corpc_one_node
         """
         cmd = self.build_cmd(self.env, "test_servers")
         self.launch_test(cmd)
diff --git a/src/tests/ftest/cart/corpc/corpc_two_node.py b/src/tests/ftest/cart/corpc/corpc_two_node.py
index 3d4d5a71a37..4f0c4dc674b 100644
--- a/src/tests/ftest/cart/corpc/corpc_two_node.py
+++ b/src/tests/ftest/cart/corpc/corpc_two_node.py
@@ -13,12 +13,13 @@ class CartCoRpcTwoNodeTest(CartTest):
     :avocado: recursive
     """
 
-    def test_cart_corpc(self):
+    def test_cart_corpc_two_node(self):
         """Test CaRT CoRPC.
 
         :avocado: tags=all,pr,daily_regression
+        :avocado: tags=vm
         :avocado: tags=cart,corpc,two_node,memcheck
-        :avocado: tags=test_cart_corpc
+        :avocado: tags=CartCoRpcTwoNodeTest,test_cart_corpc_two_node
         """
         cmd = self.build_cmd(self.env, "test_servers")
         self.launch_test(cmd)
diff --git a/src/tests/ftest/cart/ctl/ctl_five_node.py b/src/tests/ftest/cart/ctl/ctl_five_node.py
index 9cd23801148..d8cf310c694 100644
--- a/src/tests/ftest/cart/ctl/ctl_five_node.py
+++ b/src/tests/ftest/cart/ctl/ctl_five_node.py
@@ -13,12 +13,13 @@ class CartCtlFiveNodeTest(CartTest):
     :avocado: recursive
     """
 
-    def test_cart_ctl(self):
+    def test_cart_ctl_five_node(self):
         """Test CaRT ctl.
 
         :avocado: tags=all,pr,daily_regression
+        :avocado: tags=vm
         :avocado: tags=cart,ctl,five_node,memcheck
-        :avocado: tags=test_cart_ctl
+        :avocado: tags=CartCtlFiveNodeTest,test_cart_ctl_five_node
         """
         srvcmd = self.build_cmd(self.env, "test_servers")
 
diff --git a/src/tests/ftest/cart/ctl/ctl_one_node.py b/src/tests/ftest/cart/ctl/ctl_one_node.py
index 545f4b58511..bf260960592 100644
--- a/src/tests/ftest/cart/ctl/ctl_one_node.py
+++ b/src/tests/ftest/cart/ctl/ctl_one_node.py
@@ -13,12 +13,13 @@ class CartCtlOneNodeTest(CartTest):
     :avocado: recursive
     """
 
-    def test_cart_ctl(self):
+    def test_cart_ctl_one_node(self):
         """Test CaRT ctl.
 
         :avocado: tags=all,pr,daily_regression
+        :avocado: tags=vm
         :avocado: tags=cart,ctl,one_node,memcheck
-        :avocado: tags=test_cart_ctl
+        :avocado: tags=CartCtlOneNodeTest,test_cart_ctl_one_node
         """
         srvcmd = self.build_cmd(self.env, "test_servers")
 
diff --git a/src/tests/ftest/cart/ghost_rank_rpc/ghost_rank_rpc_one_node.py b/src/tests/ftest/cart/ghost_rank_rpc/ghost_rank_rpc_one_node.py
index 2c7684dac17..2e92676b9f2 100644
--- a/src/tests/ftest/cart/ghost_rank_rpc/ghost_rank_rpc_one_node.py
+++ b/src/tests/ftest/cart/ghost_rank_rpc/ghost_rank_rpc_one_node.py
@@ -17,8 +17,9 @@ def test_cart_ghost_rank_rpc(self):
         """Test ghost rank RPC.
 
         :avocado: tags=all,pr,daily_regression
+        :avocado: tags=vm
         :avocado: tags=cart,ghost_rank_rpc,one_node,memcheck
-        :avocado: tags=test_cart_ghost_rank_rpc
+        :avocado: tags=CartGhostRankRpcOneNodeTest,test_cart_ghost_rank_rpc
         """
         cmd = self.build_cmd(self.env, "test_servers")
         self.launch_test(cmd)
diff --git a/src/tests/ftest/cart/group_test/group_test.py b/src/tests/ftest/cart/group_test/group_test.py
index 85ca17d78ac..bfa7b596d23 100644
--- a/src/tests/ftest/cart/group_test/group_test.py
+++ b/src/tests/ftest/cart/group_test/group_test.py
@@ -6,19 +6,20 @@
 from cart_utils import CartTest
 
 
-class GroupTest(CartTest):
+class CartGroupTest(CartTest):
     # pylint: disable=too-few-public-methods
     """Run GroupTests for primary and secondary groups.
 
     :avocado: recursive
     """
 
-    def test_group(self):
+    def test_cart_group(self):
         """Test CaRT NoPmix Launcher.
 
         :avocado: tags=all,pr,daily_regression
+        :avocado: tags=vm
         :avocado: tags=cart,group_test,one_node,memcheck
-        :avocado: tags=test_group
+        :avocado: tags=CartGroupTest,test_cart_group
         """
         cmd = self.build_cmd(self.env, "test_servers")
         self.launch_test(cmd)
diff --git a/src/tests/ftest/cart/iv/iv_one_node.py b/src/tests/ftest/cart/iv/iv_one_node.py
index 4c49e46530b..e566d5d36ff 100644
--- a/src/tests/ftest/cart/iv/iv_one_node.py
+++ b/src/tests/ftest/cart/iv/iv_one_node.py
@@ -254,12 +254,13 @@ def _iv_test_actions(self, cmd, actions):
                         'Error code {!s} running command "{!s}"'.format(
                             cli_rtn, command))
 
-    def test_cart_iv(self):
+    def test_cart_iv_one_node(self):
         """Test CaRT IV.
 
         :avocado: tags=all,pr,daily_regression
+        :avocado: tags=vm
         :avocado: tags=cart,iv,one_node,memcheck
-        :avocado: tags=test_cart_iv
+        :avocado: tags=CartIvOneNodeTest,test_cart_iv_one_node
         """
         srvcmd = self.build_cmd(self.env, "test_servers")
 
diff --git a/src/tests/ftest/cart/iv/iv_two_node.py b/src/tests/ftest/cart/iv/iv_two_node.py
index 5d5b13bf28d..4c49e9305a9 100644
--- a/src/tests/ftest/cart/iv/iv_two_node.py
+++ b/src/tests/ftest/cart/iv/iv_two_node.py
@@ -182,13 +182,14 @@ def _iv_test_actions(self, cmd, actions):
                         'Error code {!s} running command "{!s}"'.format(
                             cli_rtn, command))
 
-    def test_cart_iv(self):
+    def test_cart_iv_two_node(self):
         """
         Test CaRT IV
 
         :avocado: tags=all,pr,daily_regression
+        :avocado: tags=vm
         :avocado: tags=cart,iv,two_node,memcheck
-        :avocado: tags=test_cart_iv
+        :avocado: tags=CartIvTwoNodeTest,test_cart_iv_two_node
         """
         srvcmd = self.build_cmd(self.env, "test_servers")
 
diff --git a/src/tests/ftest/cart/no_pmix/multictx_one_node.py b/src/tests/ftest/cart/no_pmix/multictx_one_node.py
index 574dff1bea6..14161f6123f 100644
--- a/src/tests/ftest/cart/no_pmix/multictx_one_node.py
+++ b/src/tests/ftest/cart/no_pmix/multictx_one_node.py
@@ -19,8 +19,9 @@ def test_cart_no_pmix(self):
         """Test CaRT NoPmix.
 
         :avocado: tags=all,pr,daily_regression
+        :avocado: tags=vm
         :avocado: tags=cart,no_pmix,one_node,memcheck
-        :avocado: tags=test_cart_no_pmix
+        :avocado: tags=CartNoPmixOneNodeTest,test_cart_no_pmix
         """
         cmd = self.params.get("tst_bin", '/run/tests/*/')
 
diff --git a/src/tests/ftest/cart/nopmix_launcher/launcher_one_node.py b/src/tests/ftest/cart/nopmix_launcher/launcher_one_node.py
index 61bd689bfe4..401cefc49fe 100644
--- a/src/tests/ftest/cart/nopmix_launcher/launcher_one_node.py
+++ b/src/tests/ftest/cart/nopmix_launcher/launcher_one_node.py
@@ -17,8 +17,9 @@ def test_cart_no_pmix_launcher(self):
         """Test CaRT NoPmix Launcher.
 
         :avocado: tags=all,pr,daily_regression
+        :avocado: tags=vm
         :avocado: tags=cart,no_pmix_launcher,one_node,memcheck
-        :avocado: tags=test_cart_no_pmix_launcher
+        :avocado: tags=CartNoPmixLauncherOneNodeTest,test_cart_no_pmix_launcher
         """
         cli_bin = self.params.get("test_clients_bin", '/run/tests/*/')
         cli_arg = self.params.get("test_clients_arg", '/run/tests/*/')
diff --git a/src/tests/ftest/cart/rpc/multisend_one_node.py b/src/tests/ftest/cart/rpc/multisend_one_node.py
index 4b56b12e988..b9d97390902 100644
--- a/src/tests/ftest/cart/rpc/multisend_one_node.py
+++ b/src/tests/ftest/cart/rpc/multisend_one_node.py
@@ -18,8 +18,9 @@ def test_cart_multisend(self):
         """Test multi-send
 
         :avocado: tags=all,pr,daily_regression
+        :avocado: tags=vm
         :avocado: tags=cart,rpc,one_node,memcheck,multisend,bulk
-        :avocado: tags=test_cart_multisend
+        :avocado: tags=CartMultisendOneNodeTest,test_cart_multisend
         """
         srvcmd = self.build_cmd(self.env, "test_servers")
 
diff --git a/src/tests/ftest/cart/rpc/rpc_one_node.py b/src/tests/ftest/cart/rpc/rpc_one_node.py
index 81e71b41e4d..b8ca50bf1a8 100644
--- a/src/tests/ftest/cart/rpc/rpc_one_node.py
+++ b/src/tests/ftest/cart/rpc/rpc_one_node.py
@@ -13,12 +13,13 @@ class CartRpcOneNodeTest(CartTest):
     :avocado: recursive
     """
 
-    def test_cart_rpc(self):
+    def test_cart_rpc_one_node(self):
         """Test CaRT RPC.
 
         :avocado: tags=all,pr,daily_regression
+        :avocado: tags=vm
         :avocado: tags=cart,rpc,one_node,memcheck
-        :avocado: tags=test_cart_rpc
+        :avocado: tags=CartRpcOneNodeTest,test_cart_rpc_one_node
         """
         srvcmd = self.build_cmd(self.env, "test_servers")
         clicmd = self.build_cmd(self.env, "test_clients")
diff --git a/src/tests/ftest/cart/rpc/rpc_two_node.py b/src/tests/ftest/cart/rpc/rpc_two_node.py
index 5b93ebc323f..df6afc58ecb 100644
--- a/src/tests/ftest/cart/rpc/rpc_two_node.py
+++ b/src/tests/ftest/cart/rpc/rpc_two_node.py
@@ -13,12 +13,13 @@ class CartRpcTwoNodeTest(CartTest):
     :avocado: recursive
     """
 
-    def test_cart_rpc(self):
+    def test_cart_rpc_two_node(self):
         """Test CaRT RPC.
 
         :avocado: tags=all,pr,daily_regression
+        :avocado: tags=vm
         :avocado: tags=cart,rpc,two_node,memcheck
-        :avocado: tags=test_cart_rpc
+        :avocado: tags=CartRpcTwoNodeTest,test_cart_rpc_two_node
         """
         srvcmd = self.build_cmd(self.env, "test_servers")
         clicmd = self.build_cmd(self.env, "test_clients")
diff --git a/src/tests/ftest/cart/rpc/swim_notification.py b/src/tests/ftest/cart/rpc/swim_notification.py
index 72488106357..970631b74ce 100644
--- a/src/tests/ftest/cart/rpc/swim_notification.py
+++ b/src/tests/ftest/cart/rpc/swim_notification.py
@@ -19,6 +19,7 @@ def test_cart_rpc(self):
         """Test CaRT RPC.
 
         :avocado: tags=all,pr
+        :avocado: tags=vm
         :avocado: tags=cart,rpc,one_node,swim_rank_eviction,memcheck
         :avocado: tags=CartRpcOneNodeSwimNotificationOnRankEvictionTest,test_cart_rpc
         """
diff --git a/src/tests/ftest/cart/selftest/selftest_three_node.py b/src/tests/ftest/cart/selftest/selftest_three_node.py
index c36acb2e6ae..a9f54bee628 100644
--- a/src/tests/ftest/cart/selftest/selftest_three_node.py
+++ b/src/tests/ftest/cart/selftest/selftest_three_node.py
@@ -13,12 +13,13 @@ class CartSelfThreeNodeTest(CartTest):
     :avocado: recursive
     """
 
-    def test_cart_selftest(self):
+    def test_cart_selftest_three_node(self):
         """Test CaRT Self Test.
 
         :avocado: tags=all,pr,daily_regression
-        :avocado: tags=cart,selftest,three_node,memcheck
-        :avocado: tags=test_cart_selftest
+        :avocado: tags=vm
+        :avocado: tags=cart,selftest,memcheck
+        :avocado: tags=CartSelfThreeNodeTest,test_cart_selftest_three_node
         """
         srvcmd = self.build_cmd(self.env, "test_servers")
 
diff --git a/src/tests/ftest/checksum/csum_basic.py b/src/tests/ftest/checksum/csum_basic.py
index 566f6cc0bd9..bbb396b9f3b 100644
--- a/src/tests/ftest/checksum/csum_basic.py
+++ b/src/tests/ftest/checksum/csum_basic.py
@@ -62,9 +62,9 @@ def test_single_object_with_checksum(self):
         Test Description: Write Avocado Test to verify single data after
                           pool/container disconnect/reconnect.
         :avocado: tags=all,daily_regression
-        :avocado: vm
+        :avocado: tags=vm
         :avocado: tags=checksum
-        :avocado: tags=basic_checksum_object,test_single_object_with_checksum
+        :avocado: tags=CsumContainerValidation,test_single_object_with_checksum
         """
         self.d_log.info("Writing the Single Dataset")
         record_index = 0
diff --git a/src/tests/ftest/harness/basic.py b/src/tests/ftest/harness/basic.py
index 18cec9167a9..e3997f1054a 100644
--- a/src/tests/ftest/harness/basic.py
+++ b/src/tests/ftest/harness/basic.py
@@ -22,8 +22,9 @@ def test_always_fails(self):
         """Simple test of apricot test code.
 
         :avocado: tags=all
+        :avocado: tags=vm
         :avocado: tags=harness,harness_basic_test
-        :avocado: tags=always_fails,test_always_fails
+        :avocado: tags=HarnessBasicTest,always_fails,test_always_fails
         """
         self.fail("NOOP test to do nothing but fail")
 
@@ -33,7 +34,7 @@ def test_always_fails_hw(self):
         :avocado: tags=all
         :avocado: tags=hw,large,medium,small
         :avocado: tags=harness,harness_basic_test
-        :avocado: tags=always_fails,test_always_fails_hw
+        :avocado: tags=HarnessBasicTest,always_fails,test_always_fails_hw
         """
         self.test_always_fails()
 
diff --git a/src/tests/ftest/harness/unit.py b/src/tests/ftest/harness/unit.py
index 174b46e2760..263087639de 100644
--- a/src/tests/ftest/harness/unit.py
+++ b/src/tests/ftest/harness/unit.py
@@ -18,6 +18,7 @@ def test_harness_unit_list_unique(self):
         """Verify list_unique().
 
         :avocado: tags=all
+        :avocado: tags=vm
         :avocado: tags=harness,dict_utils
         :avocado: tags=HarnessUnitTest,test_harness_unit_list_unique
         """
@@ -41,6 +42,7 @@ def test_harness_unit_list_flatten(self):
         """Verify list_flatten().
 
         :avocado: tags=all
+        :avocado: tags=vm
         :avocado: tags=harness,dict_utils
         :avocado: tags=HarnessUnitTest,test_harness_unit_list_flatten
         """
@@ -70,6 +72,7 @@ def test_harness_unit_list_stats(self):
         """Verify list_stats().
 
         :avocado: tags=all
+        :avocado: tags=vm
         :avocado: tags=harness,dict_utils
         :avocado: tags=HarnessUnitTest,test_harness_unit_list_stats
         """
@@ -92,6 +95,7 @@ def test_harness_unit_dict_extract_values(self):
         """Verify dict_extract_values().
 
         :avocado: tags=all
+        :avocado: tags=vm
         :avocado: tags=harness,dict_utils
         :avocado: tags=HarnessUnitTest,test_harness_unit_dict_extract_values
         """
@@ -152,6 +156,7 @@ def test_harness_unit_dict_subtract(self):
         """Verify dict_subtract().
 
         :avocado: tags=all
+        :avocado: tags=vm
         :avocado: tags=harness,dict_utils
         :avocado: tags=HarnessUnitTest,test_harness_unit_dict_subtract
         """