diff --git a/configuration/observatorium/tenants.libsonnet b/configuration/observatorium/tenants.libsonnet
index 83a874e50d..3b3f04b8e7 100644
--- a/configuration/observatorium/tenants.libsonnet
+++ b/configuration/observatorium/tenants.libsonnet
@@ -6,7 +6,7 @@
       oidc: {
         clientID: 'test',
         clientSecret: 'ZXhhbXBsZS1hcHAtc2VjcmV0',
-        issuerURL: 'http://dex.dex.svc.cluster.local:5556/dex',
+        issuerURL: 'http://dex.${TEST_DEX_NAMESPACE}.svc.cluster.local:5556/dex',
         usernameClaim: 'email',
       },
     },
@@ -16,7 +16,7 @@
       oidc: {
         clientID: 'test',
         clientSecret: 'ZXhhbXBsZS1hcHAtc2VjcmV0',
-        issuerURL: 'http://dex.dex.svc.cluster.local:5556/dex',
+        issuerURL: 'http://dex.${TEST_DEX_NAMESPACE}.svc.cluster.local:5556/dex',
         usernameClaim: 'email',
       },
     },
diff --git a/resources/services/observatorium-template.yaml b/resources/services/observatorium-template.yaml
index eb1d776d51..5039e02593 100644
--- a/resources/services/observatorium-template.yaml
+++ b/resources/services/observatorium-template.yaml
@@ -284,7 +284,7 @@ objects:
   stringData:
     client-id: test
     client-secret: ZXhhbXBsZS1hcHAtc2VjcmV0
-    issuer-url: http://dex.dex.svc.cluster.local:5556/dex
+    issuer-url: http://dex.${TEST_DEX_NAMESPACE}.svc.cluster.local:5556/dex
     tenants.yaml: |-
       "tenants":
       - "id": "770c1124-6ae8-4324-a9d4-9ce08590094b"
@@ -292,14 +292,14 @@ objects:
         "oidc":
           "clientID": "test"
           "clientSecret": "ZXhhbXBsZS1hcHAtc2VjcmV0"
-          "issuerURL": "http://dex.dex.svc.cluster.local:5556/dex"
+          "issuerURL": "http://dex.${TEST_DEX_NAMESPACE}.svc.cluster.local:5556/dex"
           "usernameClaim": "email"
       - "id": "FB870BF3-9F3A-44FF-9BF7-D7A047A52F43"
         "name": "telemeter"
         "oidc":
           "clientID": "test"
           "clientSecret": "ZXhhbXBsZS1hcHAtc2VjcmV0"
-          "issuerURL": "http://dex.dex.svc.cluster.local:5556/dex"
+          "issuerURL": "http://dex.${TEST_DEX_NAMESPACE}.svc.cluster.local:5556/dex"
           "usernameClaim": "email"
 - apiVersion: v1
   kind: Service
@@ -1040,3 +1040,5 @@ parameters:
   value: 1Gi
 - name: UP_MEMORY_LIMIT
   value: 2Gi
+- name: TEST_DEX_NAMESPACE
+  value: dex
diff --git a/services/dex-template.jsonnet b/services/dex-template.jsonnet
index 17834fa46c..10f7a958b7 100644
--- a/services/dex-template.jsonnet
+++ b/services/dex-template.jsonnet
@@ -24,7 +24,7 @@ local dex = (import 'github.com/observatorium/observatorium/configuration/compon
         userID: '08a8684b-db88-4b73-90a9-3cd1661f5466',
       },
     ],
-    issuer: 'http://${NAMESPACE}.${NAMESPACE}.svc.cluster.local:5556/dex',
+    issuer: 'http://dex.${NAMESPACE}.svc.cluster.local:5556/dex',
     storage: {
       type: 'sqlite3',
       config: { file: '/storage/dex.db' },
@@ -81,7 +81,7 @@ local dex = (import 'github.com/observatorium/observatorium/configuration/compon
 };
 
 {
-  apiVersion: 'v1',
+  apiVersion: 'template.openshift.io/v1',
   kind: 'Template',
   metadata: {
     name: 'dex',
diff --git a/services/minio-template.jsonnet b/services/minio-template.jsonnet
index e868fee910..fd18d769c7 100644
--- a/services/minio-template.jsonnet
+++ b/services/minio-template.jsonnet
@@ -1,6 +1,5 @@
 local minio = (import 'github.com/observatorium/observatorium/configuration/components/minio.libsonnet')({
   name:: 'minio',
-  namespace:: '${NAMESPACE}',
   image:: '${IMAGE}:${IMAGE_TAG}',
   version:: '${IMAGE_TAG}',
   accessKey:: '${MINIO_ACCESS_KEY}',
@@ -34,7 +33,7 @@ local minio = (import 'github.com/observatorium/observatorium/configuration/comp
 };
 
 {
-  apiVersion: 'v1',
+  apiVersion: 'template.openshift.io/v1',
   kind: 'Template',
   metadata: {
     name: 'minio',
@@ -48,7 +47,6 @@ local minio = (import 'github.com/observatorium/observatorium/configuration/comp
     for name in std.objectFields(minio)
   ],
   parameters: [
-    { name: 'NAMESPACE', value: 'minio' },
     { name: 'IMAGE', value: 'minio/minio' },
     { name: 'IMAGE_TAG', value: 'RELEASE.2021-09-09T21-37-07Z' },
     { name: 'REPLICAS', value: '1' },
diff --git a/services/observatorium-template.jsonnet b/services/observatorium-template.jsonnet
index d03b092707..08e7ebf14d 100644
--- a/services/observatorium-template.jsonnet
+++ b/services/observatorium-template.jsonnet
@@ -80,5 +80,6 @@ local obs = import 'observatorium.libsonnet';
     { name: 'UP_CPU_LIMIT', value: '500m' },
     { name: 'UP_MEMORY_REQUEST', value: '1Gi' },
     { name: 'UP_MEMORY_LIMIT', value: '2Gi' },
+    { name: 'TEST_DEX_NAMESPACE', value: 'dex' },
   ],
 }
diff --git a/services/observatorium.libsonnet b/services/observatorium.libsonnet
index 3062245407..370dec08a7 100644
--- a/services/observatorium.libsonnet
+++ b/services/observatorium.libsonnet
@@ -400,7 +400,7 @@ local rulesObjstore = (import 'github.com/observatorium/rules-objstore/jsonnet/l
       stringData+: {
         'client-id': 'test',
         'client-secret': 'ZXhhbXBsZS1hcHAtc2VjcmV0',
-        'issuer-url': 'http://dex.dex.svc.cluster.local:5556/dex',
+        'issuer-url': 'http://dex.${TEST_DEX_NAMESPACE}.svc.cluster.local:5556/dex',
       },
     },
   },
diff --git a/tests/.gitignore b/tests/.gitignore
new file mode 100644
index 0000000000..3227cacf8b
--- /dev/null
+++ b/tests/.gitignore
@@ -0,0 +1 @@
+*.test.env
diff --git a/tests/README.md b/tests/README.md
index bb6cecd7df..eb37254411 100644
--- a/tests/README.md
+++ b/tests/README.md
@@ -5,29 +5,45 @@ This directory includes extra resources that make it possible to deploy RHOBS in
 - [Red Hat External SSO](https://sso.redhat.com/auth/realms/redhat-external), which serves as an OIDC provider, is replaced by a local installation of [dex](https://dexidp.io/)
 - The object storage, normally provided by S3, is replaced by a local installation of [minio](https://min.io/)
 
-In addition to replacing external dependencies, this directory also includes files to [override default OpenShift template parameters](https://docs.openshift.com/container-platform/4.9/openshift_images/using-templates.html#templates-cli-generating-list-of-objects_using-templates). These files have filename `<namespace>.test.env` and are namespace-specific. The purpose of this is to override parameters in order to make the deployments suitable for testing, in particular:
+The deployment is self-contained in single namespace provided as parameter to `launch.sh deploy` script.
+
+In addition to replacing external dependencies, the `launch.sh` script also includes parameters to [override default OpenShift template parameters](https://docs.openshift.com/container-platform/4.9/openshift_images/using-templates.html#templates-cli-generating-list-of-objects_using-templates). The purpose of this is to override parameters in order to make the deployments suitable for testing, in particular:
 - The CPU / memory limits / requests are decreased so that RHOBS can be deployed on smaller clusters as well
 - The number of replicas for components is decreased as well in order for the deployment to not be too resources heavy
 - Some further object names (e.g. service accounts and images) are replaced to work with local alternatives of the external dependencies
+- Namespace name changes so all can be deployed in one namespace.
+
+The parameter files can be edited accordingly to accommodate your specific testing scenario.
+
+### Requirements.
 
-The parameter files can be edited accordingly to accomodate your specific testing scenario.
+* OpenShift cluster available.
+* [oc](https://docs.openshift.com/container-platform/4.7/cli_reference/openshift_cli/getting-started-cli.html) CLI installed.
 
 ### How to
+
 To deploy the RHOBS stack on a cluster, use the `launch.sh` script from within this directory. Run:
 
 ```bash
-./launch.sh deploy
+./launch.sh deploy <your testing namespace>
 ```
 
 This will create all the necessary namespaces and other resources for you.
 
 To tear down the installation, run:
+
 ```bash
-./launch.sh teardown
+./launch.sh teardown <your testing namespace>
 ```
-This will delete all RHOBS namespaces for you.
 
-### Additional information
+This will delete all RHOBS resources for you.
+
+### NOTE: Minio, Dex Templates
+
+Some templates like `minio-template.yaml` and `dex-template.yaml` are generated in `make manifests` process. Any manual edition to this will be removed after that command.
+
+### Additional information.
+
 Currently, not every RHOBS OpenShift template is being processed and deployed - only the 'core' parts of RHOBS are included within the testing deployment at the moment. This includes `observatorium`, `observatorium-metrics` and `telemeter` namespaces (each based on its respective template).
 
 The test deployment also does not take care of exposing services. This is left up to the user, to expose the services in a fashion suitable for the given test scenario - whether this done by using the `oc expose` command or by port forwarding to a given service / pod via `oc port-forward`.
\ No newline at end of file
diff --git a/tests/alertmanager-config.yaml b/tests/alertmanager-config.yaml
new file mode 100644
index 0000000000..e52e1bbe02
--- /dev/null
+++ b/tests/alertmanager-config.yaml
@@ -0,0 +1,8 @@
+apiVersion: v1
+kind: Secret
+metadata:
+  name: alertmanager-config
+data:
+  # "# Default"
+  alertmanager.yaml: IyBEZWZhdWx0Cg==
+type: Opaque
diff --git a/tests/cluster-roles-template.yaml b/tests/cluster-roles-template.yaml
new file mode 100644
index 0000000000..3bc8e9ff78
--- /dev/null
+++ b/tests/cluster-roles-template.yaml
@@ -0,0 +1,45 @@
+apiVersion: template.openshift.io/v1
+kind: Template
+metadata:
+  name: roles
+objects:
+- apiVersion: rbac.authorization.k8s.io/v1
+  kind: ClusterRole
+  metadata:
+    name: ${NAME}
+  rules:
+  - apiGroups:
+    - authentication.k8s.io
+    resources:
+    - tokenreviews
+    verbs:
+    - create
+  - apiGroups:
+    - authorization.k8s.io
+    resources:
+    - subjectaccessreviews
+    verbs:
+    - create
+  - apiGroups:
+      - ""
+    resourceNames:
+    - ${{NAME}}
+    resources:
+    - namespaces
+    verbs:
+    - get
+- apiVersion: rbac.authorization.k8s.io/v1
+  kind: ClusterRoleBinding
+  metadata:
+    name: ${NAME}
+  subjects:
+  - kind: ServiceAccount
+    name: rhobs
+    namespace: ${NAME}
+  roleRef:
+    kind: ClusterRole
+    name: ${NAME}
+    apiGroup: rbac.authorization.k8s.io
+parameters:
+- name: NAME
+  value: "<CHANGEME>"
diff --git a/tests/dex-template.yaml b/tests/dex-template.yaml
index 1f4e6d6563..a1b9db3d69 100644
--- a/tests/dex-template.yaml
+++ b/tests/dex-template.yaml
@@ -1,4 +1,4 @@
-apiVersion: v1
+apiVersion: template.openshift.io/v1
 kind: Template
 metadata:
   name: dex
@@ -88,7 +88,7 @@ objects:
   stringData:
     config.yaml: |-
       "enablePasswordDB": true
-      "issuer": "http://${NAMESPACE}.${NAMESPACE}.svc.cluster.local:5556/dex"
+      "issuer": "http://dex.${NAMESPACE}.svc.cluster.local:5556/dex"
       "logger":
         "level": "debug"
       "oauth2":
diff --git a/tests/launch.sh b/tests/launch.sh
index 99c8c0cc54..a748f0da72 100755
--- a/tests/launch.sh
+++ b/tests/launch.sh
@@ -1,59 +1,152 @@
-# This is a script to spin up a test environment.
+# This is a script to spin up a unique, self-contained test environment.
 
 #!/bin/bash
 
 set -e
 set -o pipefail
+set -x
+
+NAME="${2:-rhobs-test}"
+
+ns() {
+  echo "Trying to create ${NAME} namespace"
+  # Try to create namespace, best effort. For our long lived cluster, you need to create project manually.
+  oc create ns ${NAME} || true
+  oc project ${NAME}
+}
 
 role() {
-    oc apply -f observatorium-cluster-role.yaml
-    oc apply -f observatorium-cluster-role-binding.yaml
-    oc apply --namespace observatorium-metrics -f observatorium-service-account.yaml
+  oc process -f cluster-roles-template.yaml NAME=${NAME} | oc apply -f -
+  oc apply --namespace ${NAME} -f rhobs-service-account.yaml
 }
 
 minio() {
-    oc create ns minio || true
-    oc process -f minio-template.yaml | oc apply --namespace minio -f -
+  oc process -f minio-template.yaml | oc apply --namespace ${NAME} -f -
+  oc process -f minio-secret-template.yaml NAMESPACE=${NAME} MINIO_NAMESPACE=${NAME} | oc apply --namespace ${NAME} -f -
 }
 
 dex() {
-    oc create ns dex || true
-    oc process -f dex-template.yaml | oc apply --namespace dex -f -
+  oc process -f dex-template.yaml NAMESPACE=${NAME} | oc apply --namespace ${NAME} -f -
 }
 
 observatorium_metrics() {
-    oc create ns observatorium-metrics || true
-    oc process -f observatorium-metrics-thanos-objectstorage-secret-template.yaml | oc apply --namespace observatorium-metrics -f -
-    role
-    oc process --param-file=observatorium-metrics.test.env -f ../resources/services/observatorium-metrics-template.yaml | oc apply --namespace observatorium-metrics -f -
+  role
+
+  cat <<EOL > .observatorium-metrics.test.env
+NAMESPACE=${NAME}
+OBSERVATORIUM_NAMESPACE=${NAME}
+NAMESPACES='["${NAME}"]'
+
+SERVICE_ACCOUNT_NAME=rhobs
+THANOS_S3_SECRET=thanos-s3
+JAEGER_AGENT_IMAGE=jaegertracing/jaeger-agent
+
+THANOS_QUERIER_REPLICAS=1
+THANOS_QUERY_FRONTEND_REPLICAS=1
+THANOS_RECEIVE_REPLICAS=1
+THANOS_RULER_REPLICAS=1
+THANOS_STORE_BUCKET_CACHE_REPLICAS=1
+THANOS_STORE_INDEX_CACHE_REPLICAS=1
+THANOS_STORE_REPLICAS=1
+
+MEMCACHED_CPU_LIMIT=200m
+MEMCACHED_CPU_REQUEST=100m
+MEMCACHED_MEMORY_LIMIT=200Mi
+MEMCACHED_MEMORY_REQUEST=100Mi
+THANOS_COMPACTOR_MEMORY_LIMIT=200Mi
+THANOS_COMPACTOR_MEMORY_REQUEST=100Mi
+THANOS_QUERIER_CPU_LIMIT=200m
+THANOS_QUERIER_CPU_REQUEST=100m
+THANOS_QUERIER_MEMORY_LIMIT=200Mi
+THANOS_QUERIER_MEMORY_REQUEST=100Mi
+THANOS_QUERY_FRONTEND_CPU_LIMIT=200m
+THANOS_QUERY_FRONTEND_CPU_REQUEST=100m
+THANOS_QUERY_FRONTEND_MEMORY_LIMIT=200Mi
+THANOS_QUERY_FRONTEND_MEMORY_REQUEST=100Mi
+THANOS_RECEIVE_CPU_LIMIT=200m
+THANOS_RECEIVE_CPU_REQUEST=100m
+THANOS_RECEIVE_MEMORY_LIMIT=200Mi
+THANOS_RECEIVE_MEMORY_REQUEST=100Mi
+THANOS_RULER_CPU_LIMIT=200m
+THANOS_RULER_CPU_REQUEST=100m
+THANOS_RULER_MEMORY_LIMIT=200Mi
+THANOS_RULER_MEMORY_REQUEST=100Mi
+THANOS_STORE_CPU_LIMIT=200m
+THANOS_STORE_CPU_REQUEST=100m
+THANOS_STORE_MEMORY_LIMIT=200Mi
+THANOS_STORE_MEMORY_REQUEST=100Mi
+THANOS_STORE_BUCKET_CACHE_MEMCACHED_CPU_LIMIT=200m
+THANOS_STORE_BUCKET_CACHE_MEMCACHED_CPU_REQUEST=100m
+THANOS_STORE_BUCKET_CACHE_MEMCACHED_MEMORY_LIMIT=200Mi
+THANOS_STORE_BUCKET_CACHE_MEMCACHED_MEMORY_REQUEST=100Mi
+THANOS_STORE_INDEX_CACHE_MEMCACHED_CPU_LIMIT=200m
+THANOS_STORE_INDEX_CACHE_MEMCACHED_CPU_REQUEST=100m
+THANOS_STORE_INDEX_CACHE_MEMCACHED_MEMORY_LIMIT=200Mi
+THANOS_STORE_INDEX_CACHE_MEMCACHED_MEMORY_REQUEST=100Mi
+EOL
+
+  oc process --param-file=.observatorium-metrics.test.env -f ../resources/services/observatorium-metrics-template.yaml | \
+  oc apply --namespace ${NAME} -f -
+  oc apply --namespace ${NAME} -f alertmanager-config.yaml
 }
 
 observatorium() {
-    oc create ns observatorium || true
-    oc process --param-file=observatorium.test.env -f ../resources/services/observatorium-template.yaml | oc apply --namespace observatorium -f -
+  cat <<EOL > .observatorium.test.env
+NAMESPACE=${NAME}
+OBSERVATORIUM_METRICS_NAMESPACE=${NAME}
+OBSERVATORIUM_LOGS_NAMESPACE=${NAME}
+NAMESPACES='["${NAME}"]'
+
+SERVICE_ACCOUNT_NAME=default
+JAEGER_AGENT_IMAGE=jaegertracing/jaeger-agent
+GUBERNATOR_IMAGE=thrawn01/gubernator
+
+GUBERNATOR_REPLICAS=1
+OBSERVATORIUM_API_REPLICAS=1
+OBSERVATORIUM_API_CPU_LIMIT=100m
+OBSERVATORIUM_API_MEMORY_LIMIT=100Mi
+OBSERVATORIUM_API_MEMORY_REQUEST=100Mi
+UP_CPU_LIMIT=100m
+UP_MEMORY_REQUEST=100Mi
+UP_MEMORY_LIMIT=100Mi
+TEST_DEX_NAMESPACE=${NAME}
+EOL
+
+  oc process --param-file=.observatorium.test.env -f ../resources/services/observatorium-template.yaml | oc apply --namespace ${NAME} -f -
 }
 
 telemeter() {
-    oc create ns telemeter || true
-    oc apply --namespace telemeter -f telemeter-token-refersher-oidc-secret.yaml
-    oc process --param-file=telemeter.test.env -f ../resources/services/telemeter-template.yaml | oc apply --namespace telemeter -f -
+  cat <<EOL > .telemeter.test.env
+NAMESPACE=${NAME}
+OBSERVATORIUM_NAMESPACE=${NAME}
+OBSERVATORIUM_METRICS_NAMESPACE=${NAME}
+NAMESPACES='["${NAME}"]'
+
+SERVICE_ACCOUNT_NAME=default
+
+MEMCACHED_CPU_LIMIT=1
+REPLICAS=1
+TELEMETER_SERVER_MEMORY_LIMIT=200Mi
+TELEMETER_SERVER_MEMORY_REQUEST=100Mi
+EOL
+
+    oc apply --namespace ${NAME} -f telemeter-token-refersher-oidc-secret.yaml
+    oc process --param-file=.telemeter.test.env -f ../resources/services/telemeter-template.yaml TELEMETER_FORWARD_URL=http://observatorium-observatorium-api.${NAME}.svc.cluster.local:8080/api/metrics/v1/telemeter/api/v1/receive | \
+    oc apply --namespace ${NAME} -f -
 }
 
 teardown() {
-    oc delete ns telemeter || true
-    oc delete ns observatorium-metrics || true
-    oc delete ns observatorium || true
-    oc delete ns minio || true
-    oc delete ns dex || true
+    oc delete ns ${NAME} || true
 }
 
 case $1 in
 deploy)
+    ns
     minio
     dex
     observatorium
     observatorium_metrics
-    telemeter
+    #telemeter
     ;;
 teardown)
     teardown
diff --git a/tests/observatorium-metrics-thanos-objectstorage-secret-template.yaml b/tests/minio-secret-template.yaml
similarity index 63%
rename from tests/observatorium-metrics-thanos-objectstorage-secret-template.yaml
rename to tests/minio-secret-template.yaml
index 769a2abd60..1d4f4beb17 100644
--- a/tests/observatorium-metrics-thanos-objectstorage-secret-template.yaml
+++ b/tests/minio-secret-template.yaml
@@ -1,4 +1,4 @@
-apiVersion: v1
+apiVersion: template.openshift.io/v1
 kind: Template
 metadata:
   name: minio-secret
@@ -6,8 +6,8 @@ objects:
 - apiVersion: v1
   kind: Secret
   metadata:
-    name: ${THANOS_CONFIG_SECRET}
-    namespace: ${OBSERVATORIUM_METRICS_NAMESPACE}
+    name: thanos-s3
+    namespace: ${NAMESPACE}
   stringData:
     thanos.yaml: |
       type: s3
@@ -21,18 +21,14 @@ objects:
 - apiVersion: v1
   kind: Secret
   metadata:
-    name: ${THANOS_S3_SECRET}
-    namespace: ${OBSERVATORIUM_METRICS_NAMESPACE}
+    name: s3
+    namespace: ${NAMESPACE}
   data:
     aws_access_key_id: bWluaW8=
     aws_secret_access_key: bWluaW8xMjM=
   type: Opaque
 parameters:
+- name: NAMESPACE
+  value: observatorium-metrics
 - name: MINIO_NAMESPACE
   value: minio
-- name: OBSERVATORIUM_METRICS_NAMESPACE
-  value: observatorium-metrics
-- name: THANOS_CONFIG_SECRET
-  value: thanos-objectstorage
-- name: THANOS_S3_SECRET
-  value: thanos-test-s3
diff --git a/tests/minio-template.yaml b/tests/minio-template.yaml
index c6e8731380..2c43966f6c 100644
--- a/tests/minio-template.yaml
+++ b/tests/minio-template.yaml
@@ -1,4 +1,4 @@
-apiVersion: v1
+apiVersion: template.openshift.io/v1
 kind: Template
 metadata:
   name: minio
@@ -74,8 +74,6 @@ objects:
       app.kubernetes.io/name: minio
     type: ClusterIP
 parameters:
-- name: NAMESPACE
-  value: minio
 - name: IMAGE
   value: minio/minio
 - name: IMAGE_TAG
diff --git a/tests/observatorium-cluster-role-binding.yaml b/tests/observatorium-cluster-role-binding.yaml
deleted file mode 100644
index 68a3d4ac5d..0000000000
--- a/tests/observatorium-cluster-role-binding.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRoleBinding
-metadata:
-  name: observatorium
-subjects:
-- kind: ServiceAccount
-  name: observatorium
-  namespace: observatorium-metrics
-roleRef:
-  kind: ClusterRole
-  name: observatorium
-  apiGroup: rbac.authorization.k8s.io
diff --git a/tests/observatorium-cluster-role.yaml b/tests/observatorium-cluster-role.yaml
deleted file mode 100644
index ea64a1615e..0000000000
--- a/tests/observatorium-cluster-role.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
-  name: observatorium
-rules:
-- apiGroups:
-  - authentication.k8s.io
-  resources:
-  - tokenreviews
-  verbs:
-  - create
-- apiGroups:
-  - authorization.k8s.io
-  resources:
-  - subjectaccessreviews
-  verbs:
-  - create
-- apiGroups:
-  - ""
-  resourceNames:
-  - observatorium-metrics
-  resources:
-  - namespaces
-  verbs:
-  - get
diff --git a/tests/observatorium-metrics.test.env b/tests/observatorium-metrics.test.env
deleted file mode 100644
index 0e3d1ced58..0000000000
--- a/tests/observatorium-metrics.test.env
+++ /dev/null
@@ -1,46 +0,0 @@
-SERVICE_ACCOUNT_NAME=observatorium
-THANOS_S3_SECRET=thanos-test-s3
-JAEGER_AGENT_IMAGE=jaegertracing/jaeger-agent
-
-THANOS_QUERIER_REPLICAS=1
-THANOS_QUERY_FRONTEND_REPLICAS=1
-THANOS_RECEIVE_REPLICAS=1
-THANOS_RULER_REPLICAS=1
-THANOS_STORE_BUCKET_CACHE_REPLICAS=1
-THANOS_STORE_INDEX_CACHE_REPLICAS=1
-THANOS_STORE_REPLICAS=1
-
-MEMCACHED_CPU_LIMIT=200m
-MEMCACHED_CPU_REQUEST=100m
-MEMCACHED_MEMORY_LIMIT=200Mi
-MEMCACHED_MEMORY_REQUEST=100Mi
-THANOS_COMPACTOR_MEMORY_LIMIT=200Mi
-THANOS_COMPACTOR_MEMORY_REQUEST=100Mi
-THANOS_QUERIER_CPU_LIMIT=200m
-THANOS_QUERIER_CPU_REQUEST=100m
-THANOS_QUERIER_MEMORY_LIMIT=200Mi
-THANOS_QUERIER_MEMORY_REQUEST=100Mi
-THANOS_QUERY_FRONTEND_CPU_LIMIT=200m
-THANOS_QUERY_FRONTEND_CPU_REQUEST=100m
-THANOS_QUERY_FRONTEND_MEMORY_LIMIT=200Mi
-THANOS_QUERY_FRONTEND_MEMORY_REQUEST=100Mi
-THANOS_RECEIVE_CPU_LIMIT=200m
-THANOS_RECEIVE_CPU_REQUEST=100m
-THANOS_RECEIVE_MEMORY_LIMIT=200Mi
-THANOS_RECEIVE_MEMORY_REQUEST=100Mi
-THANOS_RULER_CPU_LIMIT=200m
-THANOS_RULER_CPU_REQUEST=100m
-THANOS_RULER_MEMORY_LIMIT=200Mi
-THANOS_RULER_MEMORY_REQUEST=100Mi
-THANOS_STORE_CPU_LIMIT=200m
-THANOS_STORE_CPU_REQUEST=100m
-THANOS_STORE_MEMORY_LIMIT=200Mi
-THANOS_STORE_MEMORY_REQUEST=100Mi
-THANOS_STORE_BUCKET_CACHE_MEMCACHED_CPU_LIMIT=200m
-THANOS_STORE_BUCKET_CACHE_MEMCACHED_CPU_REQUEST=100m
-THANOS_STORE_BUCKET_CACHE_MEMCACHED_MEMORY_LIMIT=200Mi
-THANOS_STORE_BUCKET_CACHE_MEMCACHED_MEMORY_REQUEST=100Mi
-THANOS_STORE_INDEX_CACHE_MEMCACHED_CPU_LIMIT=200m
-THANOS_STORE_INDEX_CACHE_MEMCACHED_CPU_REQUEST=100m
-THANOS_STORE_INDEX_CACHE_MEMCACHED_MEMORY_LIMIT=200Mi
-THANOS_STORE_INDEX_CACHE_MEMCACHED_MEMORY_REQUEST=100Mi
diff --git a/tests/observatorium.test.env b/tests/observatorium.test.env
deleted file mode 100644
index c04d2a997a..0000000000
--- a/tests/observatorium.test.env
+++ /dev/null
@@ -1,12 +0,0 @@
-SERVICE_ACCOUNT_NAME=default
-JAEGER_AGENT_IMAGE=jaegertracing/jaeger-agent
-GUBERNATOR_IMAGE=thrawn01/gubernator
-
-GUBERNATOR_REPLICAS=1
-OBSERVATORIUM_API_REPLICAS=1
-OBSERVATORIUM_API_CPU_LIMIT=100m
-OBSERVATORIUM_API_MEMORY_LIMIT=100Mi
-OBSERVATORIUM_API_MEMORY_REQUEST=100Mi
-UP_CPU_LIMIT=100m
-UP_MEMORY_REQUEST=100Mi
-UP_MEMORY_LIMIT=100Mi
diff --git a/tests/observatorium-service-account.yaml b/tests/rhobs-service-account.yaml
similarity index 67%
rename from tests/observatorium-service-account.yaml
rename to tests/rhobs-service-account.yaml
index 6e4ddd34bd..59b7054a68 100644
--- a/tests/observatorium-service-account.yaml
+++ b/tests/rhobs-service-account.yaml
@@ -1,4 +1,4 @@
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: observatorium
+  name: rhobs
diff --git a/tests/telemeter.test.env b/tests/telemeter.test.env
deleted file mode 100644
index 355e0f8976..0000000000
--- a/tests/telemeter.test.env
+++ /dev/null
@@ -1,7 +0,0 @@
-SERVICE_ACCOUNT_NAME=default
-
-TELEMETER_FORWARD_URL=http://observatorium-observatorium-api.observatorium.svc.cluster.local:8080/api/metrics/v1/telemeter/api/v1/receive
-MEMCACHED_CPU_LIMIT=1
-REPLICAS=1
-TELEMETER_SERVER_MEMORY_LIMIT=200Mi
-TELEMETER_SERVER_MEMORY_REQUEST=100Mi