diff --git a/test/assets/olm/catalog-source.yaml b/test/assets/olm/catalog-source.yaml
index d57065f71e..73e1efa77c 100644
--- a/test/assets/olm/catalog-source.yaml
+++ b/test/assets/olm/catalog-source.yaml
@@ -1,13 +1,13 @@
 apiVersion: operators.coreos.com/v1alpha1
 kind: CatalogSource
 metadata:
-  name: redhat-operators
+  name: hello-microshift-catalog
   namespace: openshift-marketplace
 spec:
   sourceType: grpc
-  image: registry.redhat.io/redhat/redhat-operator-index:v4.16
-  displayName: Red Hat Operators
-  publisher: Red Hat
+  image: quay.io/microshift/hello-microshift-catalog:latest
+  displayName: Hello MicroShift Catalog
+  publisher: MicroShift CI
   grpcPodConfig:
     securityContextConfig: restricted
   updateStrategy:
diff --git a/test/assets/olm/subscription.yaml b/test/assets/olm/subscription.yaml
index f10c0298e5..9dbedde51e 100644
--- a/test/assets/olm/subscription.yaml
+++ b/test/assets/olm/subscription.yaml
@@ -1,9 +1,11 @@
 apiVersion: operators.coreos.com/v1alpha1
 kind: Subscription
 metadata:
-  name: amq-broker
+  name: hello-microshift-operator
   namespace: openshift-operators
 spec:
-  name: amq-broker-rhel8
-  source: redhat-operators
+  channel: alpha
+  name: hello-microshift-operator
+  source: hello-microshift-catalog
   sourceNamespace: openshift-marketplace
+  installPlanApproval: Automatic
diff --git a/test/suites/optional/olm.robot b/test/suites/optional/olm.robot
index 6219038a2d..9fd05853e7 100644
--- a/test/suites/optional/olm.robot
+++ b/test/suites/optional/olm.robot
@@ -12,14 +12,14 @@ Suite Teardown      Teardown
 *** Variables ***
 ${CATALOG_SOURCE}           ./assets/olm/catalog-source.yaml
 ${SUBSCRIPTION}             ./assets/olm/subscription.yaml
-${SUBSCRIPTION_NAME}        amq-broker
+${SUBSCRIPTION_NAME}        hello-microshift-operator
 ${MARKETPLACE_NAMESPACE}    openshift-marketplace
 ${OPERATORS_NAMESPACE}      openshift-operators
 
 
 *** Test Cases ***
-Deploy AmqBroker From Red Hat Operators catalog
-    [Documentation]    Deploy AMQ Broker from Red Hat Operators catalog.
+Deploy Hello MicroShift Operator From Catalog
+    [Documentation]    Deploy hello-microshift operator from a self-contained catalog.
     [Setup]    Setup Test
 
     ${csv}=    Get CSV Name From Subscription    ${OPERATORS_NAMESPACE}    ${SUBSCRIPTION_NAME}
@@ -68,10 +68,10 @@ OLM Should Be Ready
     Named Deployment Should Be Available    olm-operator    openshift-operator-lifecycle-manager
 
 Create CatalogSource
-    [Documentation]    Create CatalogSource resource with Red Hat Community Catalog Index.
+    [Documentation]    Create CatalogSource resource with the hello-microshift catalog.
     Oc Create    -f ${CATALOG_SOURCE}
     Wait Until Keyword Succeeds    5m    10s
-    ...    CatalogSource Should Be Ready    ${MARKETPLACE_NAMESPACE}    redhat-operators
+    ...    CatalogSource Should Be Ready    ${MARKETPLACE_NAMESPACE}    hello-microshift-catalog
 
 CatalogSource Should Be Ready
     [Documentation]    Checks if CatalogSource is ready.