diff --git a/osci.yaml b/osci.yaml
index 35d1cce..2000d7b 100644
--- a/osci.yaml
+++ b/osci.yaml
@@ -1,103 +1,13 @@
 - project:
     templates:
-      - charm-unit-jobs
-    check:
-      jobs:
-      - bionic-queens-functional
-      - bionic-stein-functional
-      - bionic-train-functional
-      - bionic-ussuri-functional
-      - focal-ussuri-functional
-      - focal-victoria-functional
-      - focal-wallaby-functional
-      - focal-xena-functional
-      - focal-yoga-functional:
-          voting: false
-      - hirsute-wallaby-functional
-      - impish-xena-functional:
-          voting: false
-      - jammy-yoga-functional:
-          voting: false
+      - charm-yoga-unit-jobs
+      - charm-yoga-functional-jobs
+      - charm-xena-functional-jobs
+      - charm-wallaby-functional-jobs
+      - charm-victoria-functional-jobs
+      - charm-ussuri-functional-jobs
+      - charm-stein-functional-jobs
+      - charm-queens-functional-jobs
     vars:
       needs_charm_build: true
       charm_build_name: neutron-dynamic-routing
-
-
-- job:
-    name: jammy-yoga-functional
-    parent: func-target
-    dependencies: &smoke-jobs
-      - bionic-ussuri-functional
-    vars:
-      tox_extra_args: jammy-yoga-functional
-- job:
-    name: impish-xena-functional
-    parent: func-target
-    dependencies: *smoke-jobs
-    vars:
-      tox_extra_args: impish-xena-functional
-- job:
-    name: hirsute-wallaby-functional
-    parent: func-target
-    dependencies: *smoke-jobs
-    vars:
-      tox_extra_args: hirsute-wallaby-functional
-- job:
-    name: focal-yoga-functional
-    parent: func-target
-    dependencies: *smoke-jobs
-    vars:
-      tox_extra_args: focal-yoga-functional
-- job:
-    name: focal-xena-functional
-    parent: func-target
-    dependencies: *smoke-jobs
-    vars:
-      tox_extra_args: focal-xena-functional
-- job:
-    name: focal-wallaby-functional
-    parent: func-target
-    dependencies: *smoke-jobs
-    vars:
-      tox_extra_args: focal-wallaby-functional
-- job:
-    name: focal-victoria-functional
-    parent: func-target
-    dependencies: *smoke-jobs
-    vars:
-      tox_extra_args: focal-victoria-functional
-- job:
-    name: focal-ussuri-functional
-    parent: func-target
-    dependencies: *smoke-jobs
-    vars:
-      tox_extra_args: focal-ussuri-functional
-- job:
-    name: bionic-ussuri-functional
-    parent: func-target
-    dependencies:
-        - osci-lint
-        - tox-py35
-        - tox-py36
-        - tox-py37
-        - tox-py38
-    vars:
-      tox_extra_args: bionic-ussuri-functional
-- job:
-    name: bionic-train-functional
-    parent: func-target
-    dependencies: *smoke-jobs
-    vars:
-      tox_extra_args: bionic-train-functional
-- job:
-    name: bionic-stein-functional
-    parent: func-target
-    dependencies: *smoke-jobs
-    vars:
-      tox_extra_args: bionic-stein-functional
-- job:
-    name: bionic-queens-functional
-    parent: func-target
-    dependencies: *smoke-jobs
-    vars:
-      tox_extra_args: bionic-queens-functional
diff --git a/src/tests/bundles/bionic-queens-functional.yaml b/src/tests/bundles/bionic-queens.yaml
similarity index 100%
rename from src/tests/bundles/bionic-queens-functional.yaml
rename to src/tests/bundles/bionic-queens.yaml
diff --git a/src/tests/bundles/bionic-rocky-functional.yaml b/src/tests/bundles/bionic-rocky.yaml
similarity index 100%
rename from src/tests/bundles/bionic-rocky-functional.yaml
rename to src/tests/bundles/bionic-rocky.yaml
diff --git a/src/tests/bundles/bionic-stein-functional.yaml b/src/tests/bundles/bionic-stein.yaml
similarity index 100%
rename from src/tests/bundles/bionic-stein-functional.yaml
rename to src/tests/bundles/bionic-stein.yaml
diff --git a/src/tests/bundles/bionic-train-functional.yaml b/src/tests/bundles/bionic-train.yaml
similarity index 100%
rename from src/tests/bundles/bionic-train-functional.yaml
rename to src/tests/bundles/bionic-train.yaml
diff --git a/src/tests/bundles/bionic-ussuri-functional.yaml b/src/tests/bundles/bionic-ussuri.yaml
similarity index 100%
rename from src/tests/bundles/bionic-ussuri-functional.yaml
rename to src/tests/bundles/bionic-ussuri.yaml
diff --git a/src/tests/bundles/focal-ussuri-functional.yaml b/src/tests/bundles/focal-ussuri.yaml
similarity index 100%
rename from src/tests/bundles/focal-ussuri-functional.yaml
rename to src/tests/bundles/focal-ussuri.yaml
diff --git a/src/tests/bundles/focal-victoria-functional.yaml b/src/tests/bundles/focal-victoria.yaml
similarity index 100%
rename from src/tests/bundles/focal-victoria-functional.yaml
rename to src/tests/bundles/focal-victoria.yaml
diff --git a/src/tests/bundles/focal-wallaby-functional.yaml b/src/tests/bundles/focal-wallaby.yaml
similarity index 100%
rename from src/tests/bundles/focal-wallaby-functional.yaml
rename to src/tests/bundles/focal-wallaby.yaml
diff --git a/src/tests/bundles/focal-xena-functional.yaml b/src/tests/bundles/focal-xena.yaml
similarity index 100%
rename from src/tests/bundles/focal-xena-functional.yaml
rename to src/tests/bundles/focal-xena.yaml
diff --git a/src/tests/bundles/focal-yoga-functional.yaml b/src/tests/bundles/focal-yoga.yaml
similarity index 100%
rename from src/tests/bundles/focal-yoga-functional.yaml
rename to src/tests/bundles/focal-yoga.yaml
diff --git a/src/tests/bundles/hirsute-wallaby-functional.yaml b/src/tests/bundles/hirsute-wallaby.yaml
similarity index 100%
rename from src/tests/bundles/hirsute-wallaby-functional.yaml
rename to src/tests/bundles/hirsute-wallaby.yaml
diff --git a/src/tests/bundles/impish-xena-functional.yaml b/src/tests/bundles/impish-xena.yaml
similarity index 100%
rename from src/tests/bundles/impish-xena-functional.yaml
rename to src/tests/bundles/impish-xena.yaml
diff --git a/src/tests/bundles/jammy-yoga-functional.yaml b/src/tests/bundles/jammy-yoga.yaml
similarity index 100%
rename from src/tests/bundles/jammy-yoga-functional.yaml
rename to src/tests/bundles/jammy-yoga.yaml
diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml
index 1616553..cda6694 100644
--- a/src/tests/tests.yaml
+++ b/src/tests/tests.yaml
@@ -4,30 +4,30 @@ configure:
 - zaza.openstack.charm_tests.dragent.configure.setup
 
 gate_bundles:
-- bionic-queens-functional
-- bionic-stein-functional
-- bionic-ussuri-functional
-- focal-ussuri-functional
-- focal-victoria-functional
-- focal-wallaby-functional
-- focal-xena-functional
-- hirsute-wallaby-functional
-- impish-xena-functional
+- bionic-queens
+- bionic-stein
+- bionic-ussuri
+- focal-ussuri
+- focal-victoria
+- focal-wallaby
+- focal-xena
+- hirsute-wallaby
+- impish-xena
 
 smoke_bundles:
-- focal-ussuri-functional
+- focal-ussuri
 
 dev_bundles:
-- bionic-rocky-functional
-- bionic-train-functional
-- focal-yoga-functional
-- jammy-yoga-functional
+- bionic-rocky
+- bionic-train
+- focal-yoga
+- jammy-yoga
 
 tests:
 - zaza.openstack.charm_tests.dragent.tests.DRAgentTest
 
 tests_options:
   force_deploy:
-    - hirsute-wallaby-functional
-    - impish-xena-functional
-    - jammy-yoga-functional
+    - hirsute-wallaby
+    - impish-xena
+    - jammy-yoga
diff --git a/tox.ini b/tox.ini
index 22159df..faf6092 100644
--- a/tox.ini
+++ b/tox.ini
@@ -75,6 +75,11 @@ basepython = python3.8
 deps = -r{toxinidir}/test-requirements.txt
 commands = stestr run --slowest {posargs}
 
+[testenv:py39]
+basepython = python3.9
+deps = -r{toxinidir}/test-requirements.txt
+commands = stestr run --slowest {posargs}
+
 [testenv:pep8]
 basepython = python3
 deps = flake8==3.9.2