diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 66ab5dbb01..ec33c86c9d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -740,9 +740,12 @@ Upgrade:
     - !reference [.nightly_rules_all, rules]
   script:
     - schutzbot/deploy.sh
-    - /usr/libexec/tests/osbuild-composer/upgrade8to9.sh
-  variables:
-    RUNNER: rhos-01/rhel-9.5-nightly-x86_64-large
+    - /usr/libexec/tests/osbuild-composer/rhel-upgrade.sh
+  parallel:
+    matrix:
+      - RUNNER:
+          - rhos-01/rhel-9.5-nightly-x86_64-large
+          - rhos-01/rhel-10.0-nightly-x86_64-large
 
 NIGHTLY_FAIL:
   stage: finish
diff --git a/osbuild-composer.spec b/osbuild-composer.spec
index 2330f63f89..4b0ffd8c12 100644
--- a/osbuild-composer.spec
+++ b/osbuild-composer.spec
@@ -285,8 +285,8 @@ install -m 0644 -vp test/data/x509/*                               %{buildroot}%
 install -m 0755 -vd                                                %{buildroot}%{_datadir}/tests/osbuild-composer/schemas
 install -m 0644 -vp pkg/jobqueue/dbjobqueue/schemas/*              %{buildroot}%{_datadir}/tests/osbuild-composer/schemas/
 
-install -m 0755 -vd                                               %{buildroot}%{_datadir}/tests/osbuild-composer/upgrade8to9
-install -m 0644 -vp test/data/upgrade8to9/*                       %{buildroot}%{_datadir}/tests/osbuild-composer/upgrade8to9/
+install -m 0755 -vd                                                %{buildroot}%{_datadir}/tests/osbuild-composer/rhel-upgrade
+install -m 0644 -vp test/data/rhel-upgrade/*                       %{buildroot}%{_datadir}/tests/osbuild-composer/rhel-upgrade/
 
 %endif
 
diff --git a/test/cases/upgrade8to9.sh b/test/cases/rhel-upgrade.sh
similarity index 97%
rename from test/cases/upgrade8to9.sh
rename to test/cases/rhel-upgrade.sh
index 9b7356d916..a5f450a73b 100755
--- a/test/cases/upgrade8to9.sh
+++ b/test/cases/rhel-upgrade.sh
@@ -31,7 +31,7 @@ sudo virsh list --all > /dev/null
 
 # define custom network for libvirt
 if ! sudo virsh net-info integration > /dev/null 2>&1; then
-    sudo virsh net-define /usr/share/tests/osbuild-composer/upgrade8to9/integration.xml
+    sudo virsh net-define /usr/share/tests/osbuild-composer/rhel-upgrade/integration.xml
     sudo virsh net-start integration
 fi
 
@@ -133,7 +133,7 @@ wait_for_vm
 sudo pkill -P "$CONSOLE_PID"
 
 # copy over next phases of the test and run the first one
-sudo scp "${SSH_OPTIONS[@]}" -q -i "${SSH_KEY}" /usr/share/tests/osbuild-composer/upgrade8to9/*.sh root@"$INSTANCE_ADDRESS":
+sudo scp "${SSH_OPTIONS[@]}" -q -i "${SSH_KEY}" /usr/share/tests/osbuild-composer/rhel-upgrade/*.sh root@"$INSTANCE_ADDRESS":
 sudo scp "${SSH_OPTIONS[@]}" -q -i "${SSH_KEY}" /usr/libexec/tests/osbuild-composer/shared_lib.sh root@"$INSTANCE_ADDRESS":
 sudo scp "${SSH_OPTIONS[@]}" -q -i "${SSH_KEY}" /usr/libexec/osbuild-composer-test/define-compose-url.sh root@"$INSTANCE_ADDRESS":
 # Put comment in sshd_config to keep root login after upgrade
diff --git a/test/data/upgrade8to9/integration.xml b/test/data/rhel-upgrade/integration.xml
similarity index 100%
rename from test/data/upgrade8to9/integration.xml
rename to test/data/rhel-upgrade/integration.xml
diff --git a/test/data/upgrade8to9/upgrade_prepare.sh b/test/data/rhel-upgrade/upgrade_prepare.sh
similarity index 100%
rename from test/data/upgrade8to9/upgrade_prepare.sh
rename to test/data/rhel-upgrade/upgrade_prepare.sh
diff --git a/test/data/upgrade8to9/upgrade_verify.sh b/test/data/rhel-upgrade/upgrade_verify.sh
similarity index 100%
rename from test/data/upgrade8to9/upgrade_verify.sh
rename to test/data/rhel-upgrade/upgrade_verify.sh