diff --git a/.github/data/matrix-smoke-oss.json b/.github/data/matrix-smoke-oss.json
index 1c042f20fd..a15b9b8937 100644
--- a/.github/data/matrix-smoke-oss.json
+++ b/.github/data/matrix-smoke-oss.json
@@ -53,14 +53,14 @@
       "label": "VS 1/3",
       "image": "debian",
       "type": "oss",
-      "marker": "'vs and not vs_ipv6 and not vs_rewrite and not vs_responses and not vs_grpc and not vs_redirects and not vs_externalname and not vs_externaldns and not vs_certmanager'",
+      "marker": "'vs and not vs_ipv6 and not vs_rewrite and not vs_responses and not vs_grpc and not vs_redirects and not vs_externalname and not vs_externaldns and not vs_certmanager and not vs_api and not vs_backup and not vs_use_cluster_ip and not vs_canary and not vs_upstream and not vs_config_map'",
       "platforms": "linux/arm, linux/arm64, linux/amd64, linux/ppc64le, linux/s390x"
     },
     {
       "label": "VS 2/3",
       "image": "debian",
       "type": "oss",
-      "marker": "'vs_grpc or vs_redirects or vs_externalname or vs_externaldns'",
+      "marker": "'vs_grpc or vs_redirects or vs_externalname or vs_externaldns or vs_api or vs_backup or vs_use_cluster_ip or vs_canary or vs_upstream or vs_config_map'",
       "platforms": "linux/arm, linux/arm64, linux/amd64, linux/ppc64le, linux/s390x"
     },
     {
diff --git a/.github/data/matrix-smoke-plus.json b/.github/data/matrix-smoke-plus.json
index ac29f33c7d..476e796a7f 100644
--- a/.github/data/matrix-smoke-plus.json
+++ b/.github/data/matrix-smoke-plus.json
@@ -4,14 +4,14 @@
       "label": "VS 1/3",
       "image": "debian-plus",
       "type": "plus",
-      "marker": "'vs and not vs_ipv6 and not vs_rewrite and not vs_responses and not vs_grpc and not vs_redirects and not vs_externalname and not vs_externaldns and not vs_certmanager'",
+      "marker": "'vs and not vs_ipv6 and not vs_rewrite and not vs_responses and not vs_grpc and not vs_redirects and not vs_externalname and not vs_externaldns and not vs_certmanager and not vs_api and not vs_backup and not vs_use_cluster_ip and not vs_canary and not vs_upstream and not vs_config_map'",
       "platforms": "linux/arm64, linux/amd64"
     },
     {
       "label": "VS 2/3",
       "image": "debian-plus",
       "type": "plus",
-      "marker": "'vs_grpc or vs_redirects or vs_externalname or vs_externaldns'",
+      "marker": "'vs_grpc or vs_redirects or vs_externalname or vs_externaldns or vs_api or vs_backup or vs_use_cluster_ip or vs_canary or vs_upstream or vs_config_map'",
       "platforms": "linux/arm64, linux/amd64"
     },
     {
diff --git a/tests/suite/test_virtual_server_api.py b/tests/suite/test_virtual_server_api.py
index de097e258f..ca615e19d2 100644
--- a/tests/suite/test_virtual_server_api.py
+++ b/tests/suite/test_virtual_server_api.py
@@ -8,6 +8,7 @@
 
 
 @pytest.mark.vs
+@pytest.mark.vs_api
 @pytest.mark.skip_for_nginx_oss
 @pytest.mark.parametrize(
     "crd_ingress_controller, virtual_server_setup",
diff --git a/tests/suite/test_virtual_server_backup_service.py b/tests/suite/test_virtual_server_backup_service.py
index 7469ddcb85..e081491e0d 100644
--- a/tests/suite/test_virtual_server_backup_service.py
+++ b/tests/suite/test_virtual_server_backup_service.py
@@ -105,6 +105,7 @@ def fin():
 
 
 @pytest.mark.vs
+@pytest.mark.vs_backup
 @pytest.mark.skip_for_nginx_oss
 @pytest.mark.skip(reason="issue with VS config")
 @pytest.mark.parametrize(
diff --git a/tests/suite/test_virtual_server_configmap_keys.py b/tests/suite/test_virtual_server_configmap_keys.py
index e41ad43211..36e0860553 100644
--- a/tests/suite/test_virtual_server_configmap_keys.py
+++ b/tests/suite/test_virtual_server_configmap_keys.py
@@ -149,6 +149,7 @@ def fin():
 
 
 @pytest.mark.vs
+@pytest.mark.vs_config_map
 @pytest.mark.parametrize(
     "crd_ingress_controller, virtual_server_setup",
     [
@@ -342,6 +343,7 @@ def test_keys_in_main_config(
 
 
 @pytest.mark.vs
+@pytest.mark.vs_config_map
 @pytest.mark.parametrize(
     "crd_ingress_controller, virtual_server_setup",
     [
diff --git a/tests/suite/test_virtual_server_focused_canary.py b/tests/suite/test_virtual_server_focused_canary.py
index 261e8424c5..5a7afdae92 100644
--- a/tests/suite/test_virtual_server_focused_canary.py
+++ b/tests/suite/test_virtual_server_focused_canary.py
@@ -38,6 +38,7 @@ def get_upstreams_of_splitting(file) -> []:
 
 
 @pytest.mark.vs
+@pytest.mark.vs_canary
 @pytest.mark.parametrize(
     "crd_ingress_controller, virtual_server_setup",
     [
diff --git a/tests/suite/test_virtual_server_upstream_options.py b/tests/suite/test_virtual_server_upstream_options.py
index 29049153a2..2d932c942d 100644
--- a/tests/suite/test_virtual_server_upstream_options.py
+++ b/tests/suite/test_virtual_server_upstream_options.py
@@ -20,6 +20,7 @@
 
 
 @pytest.mark.vs
+@pytest.mark.vs_upstream
 @pytest.mark.parametrize(
     "crd_ingress_controller, virtual_server_setup",
     [
@@ -354,6 +355,7 @@ def test_v_s_overrides_config_map(
 
 
 @pytest.mark.vs
+@pytest.mark.vs_upstream
 @pytest.mark.parametrize(
     "crd_ingress_controller, virtual_server_setup",
     [
@@ -471,6 +473,7 @@ def test_openapi_validation_flow(
 
 
 @pytest.mark.vs
+@pytest.mark.vs_upstream
 @pytest.mark.skip_for_nginx_oss
 @pytest.mark.parametrize(
     "crd_ingress_controller, virtual_server_setup",
diff --git a/tests/suite/test_virtual_server_use_cluster_ip_reloads.py b/tests/suite/test_virtual_server_use_cluster_ip_reloads.py
index 97d9fcf6f1..1512b57edf 100644
--- a/tests/suite/test_virtual_server_use_cluster_ip_reloads.py
+++ b/tests/suite/test_virtual_server_use_cluster_ip_reloads.py
@@ -5,6 +5,7 @@
 
 
 @pytest.mark.vs
+@pytest.mark.vs_use_cluster_ip
 @pytest.mark.parametrize(
     "crd_ingress_controller, virtual_server_setup",
     [