diff --git a/tests/roles/test/tasks/main.yml b/tests/roles/test/tasks/main.yml
new file mode 100644
index 0000000..5a922a5
--- /dev/null
+++ b/tests/roles/test/tasks/main.yml
@@ -0,0 +1,20 @@
+---
+- include_role:
+    name: standard-test-source
+
+- include_role:
+    name: standard-test-basic
+  vars:
+    required_packages:
+      - cockpit-podman
+      - cockpit-ws
+      - git
+      - libvirt-python3
+      - make
+      - npm
+      - python3
+    tests:
+      - cockpit-podman:
+          dir: .
+          run: "{{ test_script_dir | default('.') }}/browser.sh"
+          save-files: ["logs/*"]
diff --git a/tests/run-test.sh b/tests/run-test.sh
index bab1968..0e61adb 100755
--- a/tests/run-test.sh
+++ b/tests/run-test.sh
@@ -11,11 +11,6 @@ npm install chrome-remote-interface sizzle
 
 . /etc/os-release
 export TEST_OS="${ID}-${VERSION_ID/./-}"
-# HACK: upstream tests don't recognize rhel-8-3 yet
-if [ "$TEST_OS" = "rhel-8-3" ]; then
-    export TEST_OS=rhel-8-2
-fi
-
 export TEST_AUDIT_NO_SELINUX=1
 
 RC=0
diff --git a/tests/tests.yml b/tests/tests.yml
index 7779f62..2688f2e 100644
--- a/tests/tests.yml
+++ b/tests/tests.yml
@@ -1,23 +1,6 @@
 ---
 - hosts: localhost
-  roles:
-  - role: standard-test-source
-    tags:
+  tags:
     - always
-
-  - role: standard-test-basic
-    tags:
-    - classic
-    required_packages:
-    - cockpit-podman
-    - cockpit-ws
-    - git
-    - libvirt-python3
-    - make
-    - npm
-    - python3
-    tests:
-    - browser:
-        dir: .
-        run: ./browser.sh
-        save-files: ["logs/*"]
+  roles:
+    - test