diff --git a/assets/components/openshift-router/deployment.yaml b/assets/components/openshift-router/deployment.yaml
index 4a7520c32e..af1f48f67f 100644
--- a/assets/components/openshift-router/deployment.yaml
+++ b/assets/components/openshift-router/deployment.yaml
@@ -219,7 +219,7 @@ spec:
           args:
             - -v=4
         {{- if and .AccessLoggingEnabled (not .AccessLoggingSyslogAddress) }}
-        - name: access-logs
+        - name: logs
           imagePullPolicy: IfNotPresent
           terminationMessagePolicy: FallbackToLogsOnError
           image: '{{ .ReleaseImage.haproxy_router }}'
diff --git a/scripts/auto-rebase/manifests_patches/011-ingress-deployment-access-logging.patch b/scripts/auto-rebase/manifests_patches/011-ingress-deployment-access-logging.patch
index 8bb6df79c5..b9517e5751 100644
--- a/scripts/auto-rebase/manifests_patches/011-ingress-deployment-access-logging.patch
+++ b/scripts/auto-rebase/manifests_patches/011-ingress-deployment-access-logging.patch
@@ -78,7 +78,7 @@ index 916e4b601..9261e3700 100644
            args:
              - -v=4
 +        {{- if and .AccessLoggingEnabled (not .AccessLoggingSyslogAddress) }}
-+        - name: access-logs
++        - name: logs
 +          imagePullPolicy: IfNotPresent
 +          terminationMessagePolicy: FallbackToLogsOnError
 +          image: '{{ .ReleaseImage.haproxy_router }}'
diff --git a/test/bin/common_versions.sh b/test/bin/common_versions.sh
index 444875cc87..fc8aaaaee7 100644
--- a/test/bin/common_versions.sh
+++ b/test/bin/common_versions.sh
@@ -140,3 +140,6 @@ export BREW_NIGHTLY_RELEASE_VERSION
 # Set the release type to ec, rc or zstream
 LATEST_RELEASE_TYPE="ec"
 export LATEST_RELEASE_TYPE
+
+BREW_LREL_RELEASE_VERSION="${BREW_EC_RELEASE_VERSION}"
+export BREW_LREL_RELEASE_VERSION
diff --git a/test/bin/manage_build_cache.sh b/test/bin/manage_build_cache.sh
index eeb88378ac..637b14052a 100755
--- a/test/bin/manage_build_cache.sh
+++ b/test/bin/manage_build_cache.sh
@@ -7,7 +7,7 @@ SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 # shellcheck source=test/bin/common.sh
 source "${SCRIPTDIR}/common.sh"
 
-AWS_BUCKET_NAME="${AWS_BUCKET_NAME:-microshift-build-cache}"
+AWS_BUCKET_NAME="microshift-ushift-6072-cache-us-west-2"
 BCH_SUBDIR=
 TAG_SUBDIR=
 
diff --git a/test/image-blueprints-bootc/layer1-base/group2/centos9-bootc.image-bootc b/test/image-blueprints-bootc/layer1-base/group3/centos9-bootc.image-bootc
similarity index 100%
rename from test/image-blueprints-bootc/layer1-base/group2/centos9-bootc.image-bootc
rename to test/image-blueprints-bootc/layer1-base/group3/centos9-bootc.image-bootc
diff --git a/test/image-blueprints-bootc/layer1-base/group2/rhel94-bootc.image-bootc b/test/image-blueprints-bootc/layer1-base/group3/rhel94-bootc.image-bootc
similarity index 100%
rename from test/image-blueprints-bootc/layer1-base/group2/rhel94-bootc.image-bootc
rename to test/image-blueprints-bootc/layer1-base/group3/rhel94-bootc.image-bootc
diff --git a/test/image-blueprints-bootc/layer1-base/group3/rhel96-bootc-brew-ec-with-optional.image-bootc b/test/image-blueprints-bootc/layer1-base/group3/rhel96-bootc-brew-ec-with-optional.image-bootc
new file mode 100644
index 0000000000..b40ceb3b68
--- /dev/null
+++ b/test/image-blueprints-bootc/layer1-base/group3/rhel96-bootc-brew-ec-with-optional.image-bootc
@@ -0,0 +1,3 @@
+{{- if env.Getenv "BREW_EC_RELEASE_VERSION" "" -}}
+localhost/rhel96-bootc-brew-ec-with-optional:latest
+{{- end }}
diff --git a/test/image-blueprints-bootc/layer1-base/group3/rhel96-bootc-brew-nightly-with-optional.image-bootc b/test/image-blueprints-bootc/layer1-base/group3/rhel96-bootc-brew-nightly-with-optional.image-bootc
new file mode 100644
index 0000000000..266a2dffa5
--- /dev/null
+++ b/test/image-blueprints-bootc/layer1-base/group3/rhel96-bootc-brew-nightly-with-optional.image-bootc
@@ -0,0 +1,3 @@
+{{- if env.Getenv "BREW_NIGHTLY_RELEASE_VERSION" "" -}}
+localhost/rhel96-bootc-brew-nightly-with-optional:latest
+{{- end }}
diff --git a/test/image-blueprints-bootc/layer1-base/group3/rhel96-bootc-brew-rc-with-optional.image-bootc b/test/image-blueprints-bootc/layer1-base/group3/rhel96-bootc-brew-rc-with-optional.image-bootc
new file mode 100644
index 0000000000..76cde0cba0
--- /dev/null
+++ b/test/image-blueprints-bootc/layer1-base/group3/rhel96-bootc-brew-rc-with-optional.image-bootc
@@ -0,0 +1,3 @@
+{{- if env.Getenv "BREW_RC_RELEASE_VERSION" "" -}}
+localhost/rhel96-bootc-brew-rc-with-optional:latest
+{{- end }}
diff --git a/test/image-blueprints-bootc/layer1-base/group3/rhel96-bootc-brew-zstream-with-optional.image-bootc b/test/image-blueprints-bootc/layer1-base/group3/rhel96-bootc-brew-zstream-with-optional.image-bootc
new file mode 100644
index 0000000000..af993ec682
--- /dev/null
+++ b/test/image-blueprints-bootc/layer1-base/group3/rhel96-bootc-brew-zstream-with-optional.image-bootc
@@ -0,0 +1,3 @@
+{{- if env.Getenv "BREW_Y0_RELEASE_VERSION" "" -}}
+localhost/rhel96-bootc-brew-zstream-with-optional:latest
+{{- end }}
diff --git a/test/image-blueprints-bootc/layer1-base/group2/rhel96-bootc.image-bootc b/test/image-blueprints-bootc/layer1-base/group3/rhel96-bootc.image-bootc
similarity index 100%
rename from test/image-blueprints-bootc/layer1-base/group2/rhel96-bootc.image-bootc
rename to test/image-blueprints-bootc/layer1-base/group3/rhel96-bootc.image-bootc
diff --git a/test/scenarios-bootc/releases/el96-lrel@standard1.sh b/test/scenarios-bootc/releases/el96-lrel@standard1.sh
index 052faac7e1..191741b5f2 100644
--- a/test/scenarios-bootc/releases/el96-lrel@standard1.sh
+++ b/test/scenarios-bootc/releases/el96-lrel@standard1.sh
@@ -4,7 +4,7 @@
 
 scenario_create_vms() {
     prepare_kickstart host1 kickstart-bootc.ks.template "rhel96-bootc-brew-${LATEST_RELEASE_TYPE}-with-optional"
-    launch_vm --boot_blueprint rhel96-bootc
+    launch_vm --boot_blueprint "rhel96-bootc-brew-${LATEST_RELEASE_TYPE}-with-optional"
 }
 
 scenario_remove_vms() {
diff --git a/test/scenarios-bootc/releases/el96-lrel@standard2.sh b/test/scenarios-bootc/releases/el96-lrel@standard2.sh
index 048165ad4d..fd86be7254 100644
--- a/test/scenarios-bootc/releases/el96-lrel@standard2.sh
+++ b/test/scenarios-bootc/releases/el96-lrel@standard2.sh
@@ -4,7 +4,7 @@
 
 scenario_create_vms() {
     prepare_kickstart host1 kickstart-bootc.ks.template "rhel96-bootc-brew-${LATEST_RELEASE_TYPE}-with-optional"
-    launch_vm --boot_blueprint rhel96-bootc
+    launch_vm --boot_blueprint "rhel96-bootc-brew-${LATEST_RELEASE_TYPE}-with-optional"
 }
 
 scenario_remove_vms() {
diff --git a/test/scenarios/presubmits/el96-src@rpm-install.sh b/test/scenarios/presubmits/el96-src@rpm-install.sh
index 21576362a6..8cc976a807 100644
--- a/test/scenarios/presubmits/el96-src@rpm-install.sh
+++ b/test/scenarios/presubmits/el96-src@rpm-install.sh
@@ -112,5 +112,7 @@ scenario_run_tests() {
         --variable "SOURCE_REPO_URL:${source_repo_url}" \
         --variable "TARGET_VERSION:${target_version}" \
         --variable "PREVIOUS_MINOR_VERSION:${PREVIOUS_MINOR_VERSION}" \
-        suites/rpm/install-and-upgrade-successful.robot
+        suites/rpm/install.robot \
+        suites/rpm/remove.robot \
+        suites/rpm/upgrade-successful.robot
 }
diff --git a/test/scenarios/releases/el96-lrel@standard1.sh b/test/scenarios/releases/el96-lrel@standard1.sh
deleted file mode 100644
index cfd6cf0b3d..0000000000
--- a/test/scenarios/releases/el96-lrel@standard1.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-
-# Sourced from scenario.sh and uses functions defined there.
-
-scenario_create_vms() {
-    prepare_kickstart host1 kickstart.ks.template "rhel-9.6-microshift-brew-optionals-4.${MINOR_VERSION}-${LATEST_RELEASE_TYPE}"
-    launch_vm
-}
-
-scenario_remove_vms() {
-    remove_vm host1
-}
-
-scenario_run_tests() {
-    run_tests host1 \
-        --variable "EXPECTED_OS_VERSION:9.6" \
-        suites/standard1/ suites/selinux/validate-selinux-policy.robot
-}
diff --git a/test/scenarios/releases/el96-lrel@standard2.sh b/test/scenarios/releases/el96-lrel@standard2.sh
deleted file mode 100644
index 84e892dca8..0000000000
--- a/test/scenarios/releases/el96-lrel@standard2.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-
-# Sourced from scenario.sh and uses functions defined there.
-
-scenario_create_vms() {
-    prepare_kickstart host1 kickstart.ks.template "rhel-9.6-microshift-brew-optionals-4.${MINOR_VERSION}-${LATEST_RELEASE_TYPE}"
-    launch_vm
-}
-
-scenario_remove_vms() {
-    remove_vm host1
-}
-
-scenario_run_tests() {
-    run_tests host1 suites/standard2/
-}
diff --git a/test/scenarios/releases/el96@rpm-install-upgrade.sh b/test/scenarios/releases/el96@rpm-install-upgrade.sh
new file mode 100644
index 0000000000..d9b8506c86
--- /dev/null
+++ b/test/scenarios/releases/el96@rpm-install-upgrade.sh
@@ -0,0 +1,117 @@
+#!/bin/bash
+
+# Sourced from scenario.sh and uses functions defined there.
+
+# The RPM-based image used to create the VM for this test does not
+# include MicroShift or greenboot, so tell the framework not to wait
+# for greenboot to finish when creating the VM.
+export SKIP_GREENBOOT=true
+
+# NOTE: Unlike most suites, these tests rely on being run IN ORDER to
+# ensure the host is in a good state at the start of each test. We
+# could have separated them and run them as separate scenarios, but
+# did not want to spend the resources on a new VM.
+export TEST_RANDOMIZATION=none
+
+configure_microshift_mirror() {
+    local -r repo=$1
+
+    # `repo` might be empty if we install microshift from rhocp
+    if [[ -z "${repo}" ]] ; then
+        return
+    fi
+
+    # `repo` might be an enabled repo from a released version instead
+    # of a mirror.
+    if [[ ! "${repo}" =~ ^http ]]; then
+        return
+    fi
+
+    local -r tmp_file=$(mktemp)
+    tee "${tmp_file}" >/dev/null <<EOF
+[microshift-mirror-rpms]
+name=MicroShift Mirror
+baseurl=${repo}
+enabled=1
+gpgcheck=0
+skip_if_unavailable=0
+EOF
+    copy_file_to_vm host1 "${tmp_file}" "${tmp_file}"
+    run_command_on_vm host1 "sudo cp ${tmp_file} /etc/yum.repos.d/microshift-mirror-rpms.repo"
+    rm -f "${tmp_file}"
+}
+
+configure_rhocp_repo() {
+    local -r rhocp=$1
+    local -r version=$2
+
+    # The repository may be empty if the beta mirror is not up yet
+    if [[ -z "${rhocp}" ]] ; then
+        return
+    fi
+
+    if [[ "${rhocp}" =~ ^[0-9]{2} ]]; then
+        run_command_on_vm host1 "sudo subscription-manager repos --enable rhocp-4.${rhocp}-for-rhel-9-\$(uname -m)-rpms"
+    elif [[ "${rhocp}" =~ ^http ]]; then
+        local -r ocp_repo_name="rhocp-4.${version}-for-rhel-9-mirrorbeta-rpms"
+        local -r tmp_file=$(mktemp)
+
+        tee "${tmp_file}" >/dev/null <<EOF
+[${ocp_repo_name}]
+name=Beta rhocp RPMs for RHEL 9
+baseurl=${rhocp}
+enabled=1
+gpgcheck=0
+skip_if_unavailable=0
+EOF
+        copy_file_to_vm host1 "${tmp_file}" "${tmp_file}"
+        run_command_on_vm host1 "sudo cp ${tmp_file} /etc/yum.repos.d/${ocp_repo_name}.repo"
+        rm -f "${tmp_file}"
+    fi
+}
+
+scenario_create_vms() {
+    prepare_kickstart host1 kickstart-liveimg.ks.template ""
+    launch_vm 
+
+    # Open the firewall ports. Other scenarios get this behavior by
+    # embedding settings in the blueprint, but there is no blueprint
+    # for this scenario. We need do this step before running the RF
+    # suite so that suite can assume it can reach all of the same
+    # ports as for any other test.
+    configure_vm_firewall host1
+
+    # Register the host with subscription manager so we can install
+    # dependencies.
+    subscription_manager_register host1
+}
+
+scenario_remove_vms() {
+    remove_vm host1
+}
+
+scenario_run_tests() {
+    local -r reponame=$(basename "${BREW_REPO}")
+    local -r repo_url="${WEB_SERVER_URL}/rpm-repos/${reponame}"
+
+    # Enable the rhocp and dependency repositories.
+    #
+    # Note that rhocp or beta dependencies repository may not yet exist
+    # for the current version. Then, just use whatever we can get for
+    # the previous minor version.
+    configure_rhocp_repo "${RHOCP_MINOR_Y}"       "${MINOR_VERSION}"
+    configure_rhocp_repo "${RHOCP_MINOR_Y_BETA}"  "${MINOR_VERSION}"
+    configure_rhocp_repo "${RHOCP_MINOR_Y1}"      "${PREVIOUS_MINOR_VERSION}"
+    configure_rhocp_repo "${RHOCP_MINOR_Y1_BETA}" "${PREVIOUS_MINOR_VERSION}"
+    configure_microshift_mirror "${PREVIOUS_RELEASE_REPO}"
+    run_command_on_vm host1 "sudo subscription-manager repos --enable fast-datapath-for-rhel-9-\$(uname -m)-rpms"
+
+    run_tests host1 \
+        --exitonfailure \
+        --variable "SOURCE_REPO_URL:${repo_url}" \
+        --variable "TARGET_VERSION:${BREW_LREL_RELEASE_VERSION}" \
+        --variable "PREVIOUS_MINOR_VERSION:${PREVIOUS_MINOR_VERSION}" \
+        suites/rpm/install.robot \
+        suites/rpm/remove.robot \
+        suites/rpm/upgrade-successful.robot
+}
diff --git a/test/scenarios/releases/el96@rpm-standard1.sh b/test/scenarios/releases/el96@rpm-standard1.sh
new file mode 100644
index 0000000000..eb7e86fdee
--- /dev/null
+++ b/test/scenarios/releases/el96@rpm-standard1.sh
@@ -0,0 +1,84 @@
+#!/bin/bash
+
+# Sourced from scenario.sh and uses functions defined there.
+
+# The RPM-based image used to create the VM for this test does not
+# include MicroShift or greenboot, so tell the framework not to wait
+# for greenboot to finish when creating the VM.
+export SKIP_GREENBOOT=true
+
+# NOTE: Unlike most suites, these tests rely on being run IN ORDER to
+# ensure the host is in a good state at the start of each test. We
+# could have separated them and run them as separate scenarios, but
+# did not want to spend the resources on a new VM.
+export TEST_RANDOMIZATION=none
+
+configure_rhocp_repo() {
+    local -r rhocp=$1
+    local -r version=$2
+
+    # The repository may be empty if the beta mirror is not up yet
+    if [[ -z "${rhocp}" ]] ; then
+        return
+    fi
+
+    if [[ "${rhocp}" =~ ^[0-9]{2} ]]; then
+        run_command_on_vm host1 "sudo subscription-manager repos --enable rhocp-4.${rhocp}-for-rhel-9-\$(uname -m)-rpms"
+    elif [[ "${rhocp}" =~ ^http ]]; then
+        local -r ocp_repo_name="rhocp-4.${version}-for-rhel-9-mirrorbeta-rpms"
+        local -r tmp_file=$(mktemp)
+
+        tee "${tmp_file}" >/dev/null <<EOF
+[${ocp_repo_name}]
+name=Beta rhocp RPMs for RHEL 9
+baseurl=${rhocp}
+enabled=1
+gpgcheck=0
+skip_if_unavailable=0
+EOF
+        copy_file_to_vm host1 "${tmp_file}" "${tmp_file}"
+        run_command_on_vm host1 "sudo cp ${tmp_file} /etc/yum.repos.d/${ocp_repo_name}.repo"
+        rm -f "${tmp_file}"
+    fi
+}
+
+scenario_create_vms() {
+    prepare_kickstart host1 kickstart-liveimg.ks.template ""
+    launch_vm --boot_blueprint rhel-9.6
+    # Open the firewall ports. Other scenarios get this behavior by
+    # embedding settings in the blueprint, but there is no blueprint
+    # for this scenario. We need do this step before running the RF
+    # suite so that suite can assume it can reach all of the same
+    # ports as for any other test.
+    configure_vm_firewall host1
+
+    # Register the host with subscription manager so we can install
+    # dependencies.
+    subscription_manager_register host1
+}
+
+scenario_remove_vms() {
+    remove_vm host1
+}
+
+scenario_run_tests() {
+    local -r reponame=$(basename "${BREW_REPO}")
+    local -r repo_url="${WEB_SERVER_URL}/rpm-repos/${reponame}"
+
+    # Enable the rhocp and dependency repositories.
+    #
+    # Note that rhocp or beta dependencies repository may not yet exist
+    # for the current version. Then, just use whatever we can get for
+    # the previous minor version.
+    configure_rhocp_repo "${RHOCP_MINOR_Y}"       "${MINOR_VERSION}"
+    configure_rhocp_repo "${RHOCP_MINOR_Y_BETA}"  "${MINOR_VERSION}"
+    run_command_on_vm host1 "sudo subscription-manager repos --enable fast-datapath-for-rhel-9-\$(uname -m)-rpms"
+
+    run_tests host1 \
+        --exitonfailure \
+        --variable "SOURCE_REPO_URL:${repo_url}" \
+        --variable "TARGET_VERSION:${BREW_LREL_RELEASE_VERSION}" \
+        --variable "EXPECTED_OS_VERSION:9.6" \
+        suites/rpm/install.robot \
+        suites/standard1/ suites/selinux/validate-selinux-policy.robot
+}
diff --git a/test/scenarios/releases/el96@rpm-standard2.sh b/test/scenarios/releases/el96@rpm-standard2.sh
new file mode 100644
index 0000000000..7f4a3af16b
--- /dev/null
+++ b/test/scenarios/releases/el96@rpm-standard2.sh
@@ -0,0 +1,85 @@
+#!/bin/bash
+
+# Sourced from scenario.sh and uses functions defined there.
+
+# The RPM-based image used to create the VM for this test does not
+# include MicroShift or greenboot, so tell the framework not to wait
+# for greenboot to finish when creating the VM.
+export SKIP_GREENBOOT=true
+
+# NOTE: Unlike most suites, these tests rely on being run IN ORDER to
+# ensure the host is in a good state at the start of each test. We
+# could have separated them and run them as separate scenarios, but
+# did not want to spend the resources on a new VM.
+export TEST_RANDOMIZATION=none
+
+configure_rhocp_repo() {
+    local -r rhocp=$1
+    local -r version=$2
+
+    # The repository may be empty if the beta mirror is not up yet
+    if [[ -z "${rhocp}" ]] ; then
+        return
+    fi
+
+    if [[ "${rhocp}" =~ ^[0-9]{2} ]]; then
+        run_command_on_vm host1 "sudo subscription-manager repos --enable rhocp-4.${rhocp}-for-rhel-9-\$(uname -m)-rpms"
+    elif [[ "${rhocp}" =~ ^http ]]; then
+        local -r ocp_repo_name="rhocp-4.${version}-for-rhel-9-mirrorbeta-rpms"
+        local -r tmp_file=$(mktemp)
+
+        tee "${tmp_file}" >/dev/null <<EOF
+[${ocp_repo_name}]
+name=Beta rhocp RPMs for RHEL 9
+baseurl=${rhocp}
+enabled=1
+gpgcheck=0
+skip_if_unavailable=0
+EOF
+        copy_file_to_vm host1 "${tmp_file}" "${tmp_file}"
+        run_command_on_vm host1 "sudo cp ${tmp_file} /etc/yum.repos.d/${ocp_repo_name}.repo"
+        rm -f "${tmp_file}"
+    fi
+}
+
+scenario_create_vms() {
+    prepare_kickstart host1 kickstart-liveimg.ks.template ""
+    launch_vm --boot_blueprint rhel-9.6
+
+    # Open the firewall ports. Other scenarios get this behavior by
+    # embedding settings in the blueprint, but there is no blueprint
+    # for this scenario. We need do this step before running the RF
+    # suite so that suite can assume it can reach all of the same
+    # ports as for any other test.
+    configure_vm_firewall host1
+
+    # Register the host with subscription manager so we can install
+    # dependencies.
+    subscription_manager_register host1
+}
+
+scenario_remove_vms() {
+    remove_vm host1
+}
+
+scenario_run_tests() {
+    local -r reponame=$(basename "${BREW_REPO}")
+    local -r repo_url="${WEB_SERVER_URL}/rpm-repos/${reponame}"
+
+    # Enable the rhocp and dependency repositories.
+    #
+    # Note that rhocp or beta dependencies repository may not yet exist
+    # for the current version. Then, just use whatever we can get for
+    # the previous minor version.
+    configure_rhocp_repo "${RHOCP_MINOR_Y}"       "${MINOR_VERSION}"
+    configure_rhocp_repo "${RHOCP_MINOR_Y_BETA}"  "${MINOR_VERSION}"
+    run_command_on_vm host1 "sudo subscription-manager repos --enable fast-datapath-for-rhel-9-\$(uname -m)-rpms"
+
+    run_tests host1 \
+        --exitonfailure \
+        --variable "SOURCE_REPO_URL:${repo_url}" \
+        --variable "TARGET_VERSION:${BREW_LREL_RELEASE_VERSION}" \
+        --variable "EXPECTED_OS_VERSION:9.6" \
+        suites/rpm/install.robot \
+        suites/standard2/
+}
diff --git a/test/suites/router/router.robot b/test/suites/router/router.robot
index 6e62151f20..2d7553517d 100644
--- a/test/suites/router/router.robot
+++ b/test/suites/router/router.robot
@@ -431,5 +431,5 @@ Delete Custom CA Secret
 Check Access Logs
     [Documentation]    Retrieve and check if a pattern appears in the router's access logs.
     [Arguments]    ${pattern}
-    ${logs}=    Oc Logs    deployment/router-default -c access-logs    openshift-ingress
+    ${logs}=    Oc Logs    deployment/router-default -c logs    openshift-ingress
     Should Contain    ${logs}    ${pattern}
diff --git a/test/suites/rpm/install.robot b/test/suites/rpm/install.robot
new file mode 100644
index 0000000000..6bd501123a
--- /dev/null
+++ b/test/suites/rpm/install.robot
@@ -0,0 +1,82 @@
+*** Comments ***
+# NOTE: Unlike most suites, these tests rely on being run IN ORDER to
+# ensure the host is in a good state at the start of each test. We
+# could have separated them and run them as separate scenarios, but
+# did not want to spend the resources on a new VM.
+#
+# The "Install Source Version" test wants to be run on a system where
+# MicroShift has never been installed before to ensure that all of the
+# dependencies are installed automatically. The test teardown step
+# removes those RPMs, and then "Upgrade From Previous Version"
+# installs the _older_ version of MicroShift and tries to upgrade it.
+
+
+*** Settings ***
+Documentation       Tests related to installing MicroShift on a non-ostree system
+
+Resource            ../../resources/common.resource
+Resource            ../../resources/microshift-rpm.resource
+Resource            ../../resources/microshift-host.resource
+Resource            ../../resources/microshift-process.resource
+Resource            ../../resources/ostree-data.resource
+Resource            ../../resources/ostree-health.resource
+Library             Collections
+Library             SSHLibrary
+
+Suite Setup         Setup
+Suite Teardown      Teardown
+
+Test Tags           restart    rpm-based-system    slow
+
+
+*** Variables ***
+# The URL to the repo with the version of microshift build from source
+${SOURCE_REPO_URL}      ${EMPTY}
+# The version of microshift we expect to find in that repo
+${TARGET_VERSION}       ${EMPTY}
+
+
+*** Test Cases ***
+Install Source Version
+    [Documentation]    Install the version built from source
+    Install Third Party Packages With Warnings
+    Install MicroShift RPM Packages From Repo    ${SOURCE_REPO_URL}    ${TARGET_VERSION}
+    Start MicroShift
+    Wait For MicroShift
+
+
+*** Keywords ***
+Setup
+    [Documentation]    Test suite setup
+    Check Required Env Variables
+    Should Not Be Empty    ${SOURCE_REPO_URL}    SOURCE_REPO_URL variable is required
+    Should Not Be Empty    ${TARGET_VERSION}    TARGET_VERSION variable is required
+    Login MicroShift Host
+    System Should Not Be Ostree
+    Pull Secret Should Be Installed
+
+System Should Not Be Ostree
+    [Documentation]    Make sure we run on a non-ostree system
+    ${is_ostree}=    Is System OSTree
+    Should Not Be True    ${is_ostree}
+
+Pull Secret Should Be Installed
+    [Documentation]    Check that the kickstart file installed a pull secret for us
+    # Check that the file exists without actually saving the output so
+    # we don't have to clean the logs with the secret.
+    ${rc}=    SSHLibrary.Execute Command
+    ...    cat /etc/crio/openshift-pull-secret
+    ...    sudo=True
+    ...    return_rc=True
+    ...    return_stdout=False
+    ...    return_stderr=False
+    Should Be Equal As Integers    0    ${rc}
+
+Teardown
+    [Documentation]    Test suite teardown
+    Logout MicroShift Host
+
+Install Third Party Packages With Warnings
+    [Documentation]    Install these separately to avoid having warnings
+    ...    show up in the warning check when installing MicroShift.
+    Command Should Work    dnf install -y NetworkManager-ovs containers-common
diff --git a/test/suites/rpm/remove.robot b/test/suites/rpm/remove.robot
new file mode 100644
index 0000000000..9b09feee3e
--- /dev/null
+++ b/test/suites/rpm/remove.robot
@@ -0,0 +1,63 @@
+*** Comments ***
+# NOTE: Unlike most suites, these tests rely on being run IN ORDER to
+# ensure the host is in a good state at the start of each test. We
+# could have separated them and run them as separate scenarios, but
+# did not want to spend the resources on a new VM.
+#
+# The "Install Source Version" test wants to be run on a system where
+# MicroShift has never been installed before to ensure that all of the
+# dependencies are installed automatically. The test teardown step
+# removes those RPMs, and then "Upgrade From Previous Version"
+# installs the _older_ version of MicroShift and tries to upgrade it.
+
+
+*** Settings ***
+Documentation       Tests related to installing MicroShift on a non-ostree system
+
+Resource            ../../resources/common.resource
+Resource            ../../resources/microshift-rpm.resource
+Resource            ../../resources/microshift-process.resource
+Library             Collections
+Library             SSHLibrary
+
+Suite Setup         Setup
+Suite Teardown      Teardown
+
+Test Tags           restart    rpm-based-system    slow
+
+
+*** Test Cases ***
+Remove
+    [Documentation]    Clean up an installed MicroShift instance
+    Cleanup MicroShift
+    Uninstall MicroShift RPM Packages
+
+
+*** Keywords ***
+Setup
+    [Documentation]    Test suite setup
+    Check Required Env Variables
+    Login MicroShift Host
+    System Should Not Be Ostree
+    Pull Secret Should Be Installed
+
+Pull Secret Should Be Installed
+    [Documentation]    Check that the kickstart file installed a pull secret for us
+    # Check that the file exists without actually saving the output so
+    # we don't have to clean the logs with the secret.
+    ${rc}=    SSHLibrary.Execute Command
+    ...    cat /etc/crio/openshift-pull-secret
+    ...    sudo=True
+    ...    return_rc=True
+    ...    return_stdout=False
+    ...    return_stderr=False
+    Should Be Equal As Integers    0    ${rc}
+
+System Should Not Be Ostree
+    [Documentation]    Make sure we run on a non-ostree system
+    ${is_ostree}=    Is System OSTree
+    Should Not Be True    ${is_ostree}
+
+Teardown
+    [Documentation]    Test suite teardown
+    Logout MicroShift Host
diff --git a/test/suites/rpm/install-and-upgrade-successful.robot b/test/suites/rpm/upgrade-successful.robot
similarity index 90%
rename from test/suites/rpm/install-and-upgrade-successful.robot
rename to test/suites/rpm/upgrade-successful.robot
index 9c586ae3be..f856ecde31 100644
--- a/test/suites/rpm/install-and-upgrade-successful.robot
+++ b/test/suites/rpm/upgrade-successful.robot
@@ -37,14 +37,6 @@ ${TARGET_VERSION}       ${EMPTY}
 
 
 *** Test Cases ***
-Install Source Version
-    [Documentation]    Install the version built from source
-    Install Third Party Packages With Warnings
-    Install MicroShift RPM Packages From Repo    ${SOURCE_REPO_URL}    ${TARGET_VERSION}
-    Start MicroShift
-    Wait For MicroShift
-    [Teardown]    Clean Up Test
-
 Upgrade From Previous Version
     [Documentation]    Install the previous version, then upgrade the package
     ...    also verifying that crio and microshift services were restarted
@@ -119,11 +111,6 @@ Clean Up Test
     Cleanup MicroShift
     Uninstall MicroShift RPM Packages
 
-Install Third Party Packages With Warnings
-    [Documentation]    Install these separately to avoid having warnings
-    ...    show up in the warning check when installing MicroShift.
-    Command Should Work    dnf install -y NetworkManager-ovs containers-common
-
 Version Should Match
     [Documentation]    Compare the installed version against expectations
     [Arguments]    ${expected}