diff --git a/test/scenarios-bootc/el10/presubmits/el102-src@c2cc-ipsec.sh b/test/scenarios-bootc/c2cc/el102-src@c2cc-ipsec.sh
similarity index 100%
rename from test/scenarios-bootc/el10/presubmits/el102-src@c2cc-ipsec.sh
rename to test/scenarios-bootc/c2cc/el102-src@c2cc-ipsec.sh
diff --git a/test/scenarios-bootc/el10/presubmits/el102-src@c2cc-ipv6.sh b/test/scenarios-bootc/c2cc/el102-src@c2cc-ipv6.sh
similarity index 100%
rename from test/scenarios-bootc/el10/presubmits/el102-src@c2cc-ipv6.sh
rename to test/scenarios-bootc/c2cc/el102-src@c2cc-ipv6.sh
diff --git a/test/scenarios-bootc/c2cc/el102-src@c2cc.sh b/test/scenarios-bootc/c2cc/el102-src@c2cc.sh
new file mode 100644
index 0000000000..37c747c3d8
--- /dev/null
+++ b/test/scenarios-bootc/c2cc/el102-src@c2cc.sh
@@ -0,0 +1,20 @@
+#!/bin/bash
+
+# Sourced from scenario.sh and uses functions defined there.
+
+# shellcheck source=test/bin/c2cc_common.sh
+source "${SCRIPTDIR}/c2cc_common.sh"
+
+scenario_create_vms() {
+    c2cc_create_vms rhel102-bootc-source rhel102-bootc
+}
+
+scenario_remove_vms() {
+    c2cc_remove_vms
+}
+
+scenario_run_tests() {
+    # shellcheck disable=SC2119
+    configure_c2cc_hosts
+    c2cc_run_tests "suites/c2cc/" "192.0.2.0/24"
+}
diff --git a/test/scenarios-bootc/el9/presubmits/el98-src@c2cc-ipsec.sh b/test/scenarios-bootc/c2cc/el98-src@c2cc-ipsec.sh
similarity index 100%
rename from test/scenarios-bootc/el9/presubmits/el98-src@c2cc-ipsec.sh
rename to test/scenarios-bootc/c2cc/el98-src@c2cc-ipsec.sh
diff --git a/test/scenarios-bootc/el9/presubmits/el98-src@c2cc-ipv6.sh b/test/scenarios-bootc/c2cc/el98-src@c2cc-ipv6.sh
similarity index 100%
rename from test/scenarios-bootc/el9/presubmits/el98-src@c2cc-ipv6.sh
rename to test/scenarios-bootc/c2cc/el98-src@c2cc-ipv6.sh
diff --git a/test/scenarios-bootc/c2cc/el98-src@c2cc.sh b/test/scenarios-bootc/c2cc/el98-src@c2cc.sh
new file mode 100644
index 0000000000..9d756b5e81
--- /dev/null
+++ b/test/scenarios-bootc/c2cc/el98-src@c2cc.sh
@@ -0,0 +1,20 @@
+#!/bin/bash
+
+# Sourced from scenario.sh and uses functions defined there.
+
+# shellcheck source=test/bin/c2cc_common.sh
+source "${SCRIPTDIR}/c2cc_common.sh"
+
+scenario_create_vms() {
+    c2cc_create_vms rhel98-bootc-source rhel98-bootc
+}
+
+scenario_remove_vms() {
+    c2cc_remove_vms
+}
+
+scenario_run_tests() {
+    # shellcheck disable=SC2119
+    configure_c2cc_hosts
+    c2cc_run_tests "suites/c2cc/" "192.0.2.0/24"
+}
diff --git a/test/scenarios-bootc/el10/presubmits/el102-src@c2cc.sh b/test/scenarios-bootc/el10/presubmits/el102-src@c2cc.sh
deleted file mode 100644
index 37c747c3d8..0000000000
--- a/test/scenarios-bootc/el10/presubmits/el102-src@c2cc.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-
-# Sourced from scenario.sh and uses functions defined there.
-
-# shellcheck source=test/bin/c2cc_common.sh
-source "${SCRIPTDIR}/c2cc_common.sh"
-
-scenario_create_vms() {
-    c2cc_create_vms rhel102-bootc-source rhel102-bootc
-}
-
-scenario_remove_vms() {
-    c2cc_remove_vms
-}
-
-scenario_run_tests() {
-    # shellcheck disable=SC2119
-    configure_c2cc_hosts
-    c2cc_run_tests "suites/c2cc/" "192.0.2.0/24"
-}
diff --git a/test/scenarios-bootc/el10/presubmits/el102-src@c2cc.sh b/test/scenarios-bootc/el10/presubmits/el102-src@c2cc.sh
new file mode 120000
index 0000000000..f122e5907a
--- /dev/null
+++ b/test/scenarios-bootc/el10/presubmits/el102-src@c2cc.sh
@@ -0,0 +1 @@
+../../c2cc/el102-src@c2cc.sh
\ No newline at end of file
diff --git a/test/scenarios-bootc/el9/presubmits/el98-src@c2cc.sh b/test/scenarios-bootc/el9/presubmits/el98-src@c2cc.sh
deleted file mode 100644
index 9d756b5e81..0000000000
--- a/test/scenarios-bootc/el9/presubmits/el98-src@c2cc.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-
-# Sourced from scenario.sh and uses functions defined there.
-
-# shellcheck source=test/bin/c2cc_common.sh
-source "${SCRIPTDIR}/c2cc_common.sh"
-
-scenario_create_vms() {
-    c2cc_create_vms rhel98-bootc-source rhel98-bootc
-}
-
-scenario_remove_vms() {
-    c2cc_remove_vms
-}
-
-scenario_run_tests() {
-    # shellcheck disable=SC2119
-    configure_c2cc_hosts
-    c2cc_run_tests "suites/c2cc/" "192.0.2.0/24"
-}
diff --git a/test/scenarios-bootc/el9/presubmits/el98-src@c2cc.sh b/test/scenarios-bootc/el9/presubmits/el98-src@c2cc.sh
new file mode 120000
index 0000000000..2cfe26ae15
--- /dev/null
+++ b/test/scenarios-bootc/el9/presubmits/el98-src@c2cc.sh
@@ -0,0 +1 @@
+../../c2cc/el98-src@c2cc.sh
\ No newline at end of file