diff --git a/tests/e2e/basic/performance_tests/dataplane_throughput_test/open_security/test_bridge_mode.py b/tests/e2e/basic/performance_tests/dataplane_throughput_test/open_security/test_bridge_mode.py
index a5f83aa9e..2bc339d0c 100644
--- a/tests/e2e/basic/performance_tests/dataplane_throughput_test/open_security/test_bridge_mode.py
+++ b/tests/e2e/basic/performance_tests/dataplane_throughput_test/open_security/test_bridge_mode.py
@@ -37,6 +37,7 @@ class TestDataplaneThroughputBRIDGE(object):
     """
 
     @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-3673", name="WIFI-3673")
+    @pytest.mark.open
     @pytest.mark.twog
     def test_tcp_upd_open_bridge_2g_band(self, get_test_library, get_dut_logs_per_test_case,
                                          get_test_device_logs, client_type,
@@ -60,6 +61,7 @@ class TestDataplaneThroughputBRIDGE(object):
                                                    )
 
     @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-3674", name="WIFI-3674")
+    @pytest.mark.open
     @pytest.mark.fiveg
     def test_tcp_upd_open_bridge_5g_band(self, get_test_library, get_dut_logs_per_test_case,
                                          get_test_device_logs, client_type,
diff --git a/tests/e2e/basic/performance_tests/dataplane_throughput_test/open_security/test_nat_mode.py b/tests/e2e/basic/performance_tests/dataplane_throughput_test/open_security/test_nat_mode.py
index 099008a06..07ac32679 100644
--- a/tests/e2e/basic/performance_tests/dataplane_throughput_test/open_security/test_nat_mode.py
+++ b/tests/e2e/basic/performance_tests/dataplane_throughput_test/open_security/test_nat_mode.py
@@ -37,6 +37,7 @@ class TestDataplaneThroughputNAT(object):
     """
 
     @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-3673", name="WIFI-3673")
+    @pytest.mark.open
     @pytest.mark.twog
     def test_tcp_upd_open_nat_2g_band(self, get_test_library, get_dut_logs_per_test_case,
                                       get_test_device_logs, client_type,
@@ -60,6 +61,7 @@ class TestDataplaneThroughputNAT(object):
                                                    )
 
     @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-3674", name="WIFI-3674")
+    @pytest.mark.open
     @pytest.mark.fiveg
     def test_tcp_upd_open_nat_5g_band(self, get_test_library, get_dut_logs_per_test_case,
                                       get_test_device_logs, client_type,
diff --git a/tests/e2e/basic/performance_tests/dataplane_throughput_test/open_security/test_vlan_mode.py b/tests/e2e/basic/performance_tests/dataplane_throughput_test/open_security/test_vlan_mode.py
index 69522a71d..6923fd849 100644
--- a/tests/e2e/basic/performance_tests/dataplane_throughput_test/open_security/test_vlan_mode.py
+++ b/tests/e2e/basic/performance_tests/dataplane_throughput_test/open_security/test_vlan_mode.py
@@ -36,6 +36,7 @@ class TestDataplaneThroughputVLAN(object):
     """
 
     @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-3673", name="WIFI-3673")
+    @pytest.mark.open
     @pytest.mark.twog
     def test_tcp_upd_open_vlan_2g_band(self, get_test_library, get_dut_logs_per_test_case,
                                        get_test_device_logs, client_type,
diff --git a/tests/e2e/basic/performance_tests/dataplane_throughput_test/wpa2_security/test_bridge_mode.py b/tests/e2e/basic/performance_tests/dataplane_throughput_test/wpa2_security/test_bridge_mode.py
index 19b356897..329f573e8 100644
--- a/tests/e2e/basic/performance_tests/dataplane_throughput_test/wpa2_security/test_bridge_mode.py
+++ b/tests/e2e/basic/performance_tests/dataplane_throughput_test/wpa2_security/test_bridge_mode.py
@@ -37,6 +37,7 @@ class TestDataplaneThroughputBRIDGE(object):
     """
 
     @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-3673", name="WIFI-3673")
+    @pytest.mark.wpa2_personal
     @pytest.mark.twog
     def test_tcp_upd_wpa2_personal_bridge_2g_band(self, get_test_library, get_dut_logs_per_test_case,
                                                   get_test_device_logs, client_type,
@@ -61,6 +62,7 @@ class TestDataplaneThroughputBRIDGE(object):
                                                    )
 
     @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-3674", name="WIFI-3674")
+    @pytest.mark.wpa2_personal
     @pytest.mark.fiveg
     def test_tcp_upd_wpa2_personal_bridge_5g_band(self, get_test_library, get_dut_logs_per_test_case,
                                                   get_test_device_logs, client_type,
diff --git a/tests/e2e/basic/performance_tests/dataplane_throughput_test/wpa2_security/test_nat_mode.py b/tests/e2e/basic/performance_tests/dataplane_throughput_test/wpa2_security/test_nat_mode.py
index a93f17d36..467fd7280 100644
--- a/tests/e2e/basic/performance_tests/dataplane_throughput_test/wpa2_security/test_nat_mode.py
+++ b/tests/e2e/basic/performance_tests/dataplane_throughput_test/wpa2_security/test_nat_mode.py
@@ -37,6 +37,7 @@ class TestDataplaneThroughputNAT(object):
     """
 
     @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-3673", name="WIFI-3673")
+    @pytest.mark.wpa2_personal
     @pytest.mark.twog
     def test_tcp_upd_wpa2_personal_nat_2g_band(self, get_test_library, get_dut_logs_per_test_case,
                                                get_test_device_logs, client_type,
@@ -61,6 +62,7 @@ class TestDataplaneThroughputNAT(object):
                                                    )
 
     @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-3674", name="WIFI-3674")
+    @pytest.mark.wpa2_personal
     @pytest.mark.fiveg
     def test_tcp_upd_wpa2_personal_nat_5g_band(self, get_test_library, get_dut_logs_per_test_case,
                                                get_test_device_logs, client_type,
diff --git a/tests/e2e/basic/performance_tests/dataplane_throughput_test/wpa2_security/test_vlan_mode.py b/tests/e2e/basic/performance_tests/dataplane_throughput_test/wpa2_security/test_vlan_mode.py
index faedfc8d2..aa0aed321 100644
--- a/tests/e2e/basic/performance_tests/dataplane_throughput_test/wpa2_security/test_vlan_mode.py
+++ b/tests/e2e/basic/performance_tests/dataplane_throughput_test/wpa2_security/test_vlan_mode.py
@@ -38,6 +38,7 @@ class TestDataplaneThroughputVLAN(object):
     """
 
     @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-3673", name="WIFI-3673")
+    @pytest.mark.wpa2_personal
     @pytest.mark.twog
     def test_tcp_upd_wpa2_personal_vlan_2g_band(self, get_test_library, get_dut_logs_per_test_case,
                                                 get_test_device_logs, client_type,
@@ -64,6 +65,7 @@ class TestDataplaneThroughputVLAN(object):
                                                    )
 
     @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-3674", name="WIFI-3674")
+    @pytest.mark.wpa2_personal
     @pytest.mark.fiveg
     def test_tcp_upd_wpa2_personal_vlan_5g_band(self, get_test_library, get_dut_logs_per_test_case,
                                                 get_test_device_logs, client_type,
diff --git a/tests/e2e/basic/performance_tests/dataplane_throughput_test/wpa3_security/test_bridge_mode.py b/tests/e2e/basic/performance_tests/dataplane_throughput_test/wpa3_security/test_bridge_mode.py
index fd00b6c99..2221a5ef2 100644
--- a/tests/e2e/basic/performance_tests/dataplane_throughput_test/wpa3_security/test_bridge_mode.py
+++ b/tests/e2e/basic/performance_tests/dataplane_throughput_test/wpa3_security/test_bridge_mode.py
@@ -37,6 +37,7 @@ class TestDataplaneThroughputBRIDGE(object):
     """
 
     @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-3673", name="WIFI-3673")
+    @pytest.mark.wpa3_personal
     @pytest.mark.twog
     def test_tcp_upd_wpa3_personal_bridge_2g_band(self, get_test_library, get_dut_logs_per_test_case,
                                                   get_test_device_logs, client_type,
@@ -61,6 +62,7 @@ class TestDataplaneThroughputBRIDGE(object):
                                                    )
 
     @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-3674", name="WIFI-3674")
+    @pytest.mark.wpa3_personal
     @pytest.mark.fiveg
     def test_tcp_upd_wpa3_personal_bridge_5g_band(self, get_test_library, get_dut_logs_per_test_case,
                                                   get_test_device_logs, client_type,
diff --git a/tests/e2e/basic/performance_tests/dataplane_throughput_test/wpa3_security/test_nat_mode.py b/tests/e2e/basic/performance_tests/dataplane_throughput_test/wpa3_security/test_nat_mode.py
index dc1785585..37634aa62 100644
--- a/tests/e2e/basic/performance_tests/dataplane_throughput_test/wpa3_security/test_nat_mode.py
+++ b/tests/e2e/basic/performance_tests/dataplane_throughput_test/wpa3_security/test_nat_mode.py
@@ -37,6 +37,7 @@ class TestDataplaneThroughputNAT(object):
     """
 
     @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-3673", name="WIFI-3673")
+    @pytest.mark.wpa3_personal
     @pytest.mark.twog
     def test_tcp_upd_wpa3_personal_nat_2g_band(self, get_test_library, get_dut_logs_per_test_case,
                                                get_test_device_logs, client_type,
@@ -61,6 +62,7 @@ class TestDataplaneThroughputNAT(object):
                                                    )
 
     @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-3674", name="WIFI-3674")
+    @pytest.mark.wpa3_personal
     @pytest.mark.fiveg
     def test_tcp_upd_wpa3_personal_nat_5g_band(self, get_test_library, get_dut_logs_per_test_case,
                                                get_test_device_logs, client_type,
diff --git a/tests/e2e/basic/performance_tests/dataplane_throughput_test/wpa3_security/test_vlan_mode.py b/tests/e2e/basic/performance_tests/dataplane_throughput_test/wpa3_security/test_vlan_mode.py
index ba0fddc3b..a40b2f1a3 100644
--- a/tests/e2e/basic/performance_tests/dataplane_throughput_test/wpa3_security/test_vlan_mode.py
+++ b/tests/e2e/basic/performance_tests/dataplane_throughput_test/wpa3_security/test_vlan_mode.py
@@ -38,6 +38,7 @@ class TestDataplaneThroughputVLAN(object):
     """
 
     @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-3673", name="WIFI-3673")
+    @pytest.mark.wpa3_personal
     @pytest.mark.twog
     def test_tcp_upd_wpa3_personal_vlan_2g_band(self, get_test_library, get_dut_logs_per_test_case,
                                                 get_test_device_logs, client_type,
@@ -64,6 +65,7 @@ class TestDataplaneThroughputVLAN(object):
                                                    )
 
     @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-3674", name="WIFI-3674")
+    @pytest.mark.wpa3_personal
     @pytest.mark.fiveg
     def test_tcp_upd_wpa3_personal_vlan_5g_band(self, get_test_library, get_dut_logs_per_test_case,
                                                 get_test_device_logs, client_type,
@@ -72,7 +74,7 @@ class TestDataplaneThroughputVLAN(object):
         """Dataplane THroughput VLAN Mode
            pytest -m "dataplane_tests and vlan and wpa3_personal and fiveg"
         """
-        profile_data = {"ssid_name": "wpa3_personal_dataplane_2g", "appliedRadios": ["2G"], "security_key": "something",
+        profile_data = {"ssid_name": "wpa3_personal_dataplane_5g", "appliedRadios": ["2G"], "security_key": "something",
                         "vlan": 100}
         ssid_name = profile_data["ssid_name"]
         security = "wpa3"
diff --git a/tests/e2e/basic/performance_tests/dataplane_throughput_test/wpa_security/test_bridge_mode.py b/tests/e2e/basic/performance_tests/dataplane_throughput_test/wpa_security/test_bridge_mode.py
index ad70621ab..b3c954044 100644
--- a/tests/e2e/basic/performance_tests/dataplane_throughput_test/wpa_security/test_bridge_mode.py
+++ b/tests/e2e/basic/performance_tests/dataplane_throughput_test/wpa_security/test_bridge_mode.py
@@ -37,6 +37,7 @@ class TestDataplaneThroughputBRIDGE(object):
     """
 
     @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-3673", name="WIFI-3673")
+    @pytest.mark.wpa_personal
     @pytest.mark.twog
     def test_tcp_upd_wpa_bridge_2g_band(self, get_test_library, get_dut_logs_per_test_case,
                                         get_test_device_logs, client_type,
@@ -61,6 +62,7 @@ class TestDataplaneThroughputBRIDGE(object):
                                                    )
 
     @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-3674", name="WIFI-3674")
+    @pytest.mark.wpa_personal
     @pytest.mark.fiveg
     def test_tcp_upd_wpa_bridge_5g_band(self, get_test_library, get_dut_logs_per_test_case,
                                         get_test_device_logs, client_type,
diff --git a/tests/e2e/basic/performance_tests/dataplane_throughput_test/wpa_security/test_nat_mode.py b/tests/e2e/basic/performance_tests/dataplane_throughput_test/wpa_security/test_nat_mode.py
index da7719279..7b84fb23e 100644
--- a/tests/e2e/basic/performance_tests/dataplane_throughput_test/wpa_security/test_nat_mode.py
+++ b/tests/e2e/basic/performance_tests/dataplane_throughput_test/wpa_security/test_nat_mode.py
@@ -37,6 +37,7 @@ class TestDataplaneThroughputNAT(object):
     """
 
     @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-3673", name="WIFI-3673")
+    @pytest.mark.wpa_personal
     @pytest.mark.twog
     def test_tcp_upd_wpa_nat_2g_band(self, get_test_library, get_dut_logs_per_test_case,
                                      get_test_device_logs, client_type,
@@ -61,6 +62,7 @@ class TestDataplaneThroughputNAT(object):
                                                    )
 
     @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-3674", name="WIFI-3674")
+    @pytest.mark.wpa_personal
     @pytest.mark.fiveg
     def test_tcp_upd_wpa_nat_5g_band(self, get_test_library, get_dut_logs_per_test_case,
                                      get_test_device_logs, client_type,
diff --git a/tests/e2e/basic/performance_tests/dataplane_throughput_test/wpa_security/test_vlan_mode.py b/tests/e2e/basic/performance_tests/dataplane_throughput_test/wpa_security/test_vlan_mode.py
index 2a7330999..d282ce724 100644
--- a/tests/e2e/basic/performance_tests/dataplane_throughput_test/wpa_security/test_vlan_mode.py
+++ b/tests/e2e/basic/performance_tests/dataplane_throughput_test/wpa_security/test_vlan_mode.py
@@ -36,6 +36,7 @@ class TestDataplaneThroughputVLAN(object):
     """
 
     @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-3673", name="WIFI-3673")
+    @pytest.mark.wpa_personal
     @pytest.mark.twog
     def test_tcp_upd_wpa_vlan_2g_band(self, get_test_library, get_dut_logs_per_test_case,
                                       get_test_device_logs, client_type,
@@ -61,6 +62,7 @@ class TestDataplaneThroughputVLAN(object):
                                                    )
 
     @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-3674", name="WIFI-3674")
+    @pytest.mark.wpa_personal
     @pytest.mark.fiveg
     def test_tcp_upd_wpa_vlan_5g_band(self, get_test_library, get_dut_logs_per_test_case,
                                       get_test_device_logs, client_type,