diff --git a/shared/billing/__init__.py b/shared/billing/__init__.py
deleted file mode 100644
index 3010b6d02..000000000
--- a/shared/billing/__init__.py
+++ /dev/null
@@ -1,53 +0,0 @@
-from enum import Enum
-
-from django.conf import settings
-from typing_extensions import deprecated
-
-from shared.license import get_current_license
-from shared.plan.constants import PlanName
-
-
-@deprecated("Use PlanService")
-class BillingPlan(Enum):
-    users_basic = PlanName.BASIC_PLAN_NAME.value
-    users_trial = PlanName.TRIAL_PLAN_NAME.value
-    pr_monthly = PlanName.CODECOV_PRO_MONTHLY.value
-    pr_yearly = PlanName.CODECOV_PRO_YEARLY.value
-    SENTRY_MONTHLY = PlanName.SENTRY_MONTHLY.value
-    SENTRY_YEARLY = PlanName.SENTRY_YEARLY.value
-    team_monthly = PlanName.TEAM_MONTHLY.value
-    team_yearly = PlanName.TEAM_YEARLY.value
-    users_ghm = PlanName.GHM_PLAN_NAME.value
-    users_free = PlanName.FREE_PLAN_NAME.value
-    users_monthly = PlanName.CODECOV_PRO_MONTHLY_LEGACY.value
-    users_yearly = PlanName.CODECOV_PRO_YEARLY_LEGACY.value
-    enterprise_cloud_monthly = PlanName.ENTERPRISE_CLOUD_MONTHLY.value
-    enterprise_cloud_yearly = PlanName.ENTERPRISE_CLOUD_YEARLY.value
-
-    def __init__(self, db_name):
-        self.db_name = db_name
-
-    @classmethod
-    def from_str(cls, plan_name: str):
-        for plan in cls:
-            if plan.db_name == plan_name:
-                return plan
-
-
-@deprecated("use is_enterprise_plan() in PlanService")
-def is_enterprise_cloud_plan(plan: BillingPlan) -> bool:
-    return plan in [
-        BillingPlan.enterprise_cloud_monthly,
-        BillingPlan.enterprise_cloud_yearly,
-    ]
-
-
-@deprecated("use is_pr_billing_plan() in PlanService")
-def is_pr_billing_plan(plan: str) -> bool:
-    if not settings.IS_ENTERPRISE:
-        return plan not in [
-            PlanName.CODECOV_PRO_MONTHLY_LEGACY.value,
-            PlanName.CODECOV_PRO_YEARLY_LEGACY.value,
-        ]
-    else:
-        return get_current_license().is_pr_billing
diff --git a/shared/celery_router.py b/shared/celery_router.py
index 4a83717ad..da9867cca 100644
--- a/shared/celery_router.py
+++ b/shared/celery_router.py
@@ -3,9 +3,9 @@
 from collections import OrderedDict
 from collections.abc import Mapping
 
-from shared.billing import BillingPlan, is_enterprise_cloud_plan
 from shared.celery_config import BaseCeleryConfig, get_task_group
 from shared.config import get_config
+from shared.django_apps.codecov_auth.models import Plan
 
 Pattern = re.Pattern
 
@@ -48,8 +48,8 @@ def route_tasks_based_on_user_plan(task_name: str, user_plan: str):
     default_task_queue = (
         route(task_name) or dict(queue=BaseCeleryConfig.task_default_queue)
     )["queue"]
-    billing_plan = BillingPlan.from_str(user_plan)
-    if is_enterprise_cloud_plan(billing_plan):
+    plan = Plan.objects.get(name=user_plan)
+    if plan.is_enterprise_plan:
         default_enterprise_queue_specific_config = get_config(
             "setup", "tasks", "celery", "enterprise", default=dict()
         )
diff --git a/shared/plan/service.py b/shared/plan/service.py
index bf2180ef6..c98f81cf5 100644
--- a/shared/plan/service.py
+++ b/shared/plan/service.py
@@ -3,10 +3,12 @@
 from functools import cached_property
 from typing import List, Optional
 
-from shared.billing import is_pr_billing_plan
+from django.conf import settings
+
 from shared.config import get_config
 from shared.django_apps.codecov.commands.exceptions import ValidationError
 from shared.django_apps.codecov_auth.models import Owner, Plan, Service
+from shared.license import get_current_license
 from shared.plan.constants import (
     DEFAULT_FREE_PLAN,
     TEAM_PLAN_MAX_USERS,
@@ -348,4 +350,10 @@ def is_trial_plan(self) -> bool:
 
     @property
     def is_pr_billing_plan(self) -> bool:
-        return is_pr_billing_plan(plan=self.plan_name)
+        if not settings.IS_ENTERPRISE:
+            return self.plan_data.name not in [
+                PlanName.CODECOV_PRO_MONTHLY_LEGACY.value,
+                PlanName.CODECOV_PRO_YEARLY_LEGACY.value,
+            ]
+        else:
+            return get_current_license().is_pr_billing
diff --git a/tests/unit/billing/__init__.py b/tests/unit/billing/__init__.py
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/unit/billing/test_enum_definitions.py b/tests/unit/billing/test_enum_definitions.py
deleted file mode 100644
index 8893d012a..000000000
--- a/tests/unit/billing/test_enum_definitions.py
+++ /dev/null
@@ -1,99 +0,0 @@
-import pytest
-from django.test import override_settings
-
-from shared.billing import BillingPlan, is_enterprise_cloud_plan, is_pr_billing_plan
-from shared.django_apps.codecov_auth.tests.factories import OwnerFactory
-
-
-@pytest.fixture
-def dbsession(db):
-    return db
-
-
-@override_settings(IS_ENTERPRISE=False)
-def test_pr_author_plan_check(dbsession, mock_configuration):
-    owner = OwnerFactory(service="github", plan="users-pr-inappm")
-    if dbsession is not None:
-        dbsession.add(owner)
-        dbsession.flush()
-    assert is_pr_billing_plan(owner.plan)
-
-
-@override_settings(IS_ENTERPRISE=True)
-def test_pr_author_enterprise_plan_check(dbsession, mock_configuration):
-    owner = OwnerFactory(service="github")
-    if dbsession is not None:
-        dbsession.add(owner)
-        dbsession.flush()
-
-    encrypted_license = "wxWEJyYgIcFpi6nBSyKQZQeaQ9Eqpo3SXyUomAqQOzOFjdYB3A8fFM1rm+kOt2ehy9w95AzrQqrqfxi9HJIb2zLOMOB9tSy52OykVCzFtKPBNsXU/y5pQKOfV7iI3w9CHFh3tDwSwgjg8UsMXwQPOhrpvl2GdHpwEhFdaM2O3vY7iElFgZfk5D9E7qEnp+WysQwHKxDeKLI7jWCnBCBJLDjBJRSz0H7AfU55RQDqtTrnR+rsLDHOzJ80/VxwVYhb"
-    mock_configuration.params["setup"]["enterprise_license"] = encrypted_license
-    mock_configuration.params["setup"]["codecov_dashboard_url"] = (
-        "https://codecov.mysite.com"
-    )
-
-    assert is_pr_billing_plan(owner.plan)
-
-
-@override_settings(IS_ENTERPRISE=False)
-def test_plan_not_pr_author(dbsession, mock_configuration):
-    owner = OwnerFactory(service="github", plan=BillingPlan.users_monthly.value)
-    if dbsession is not None:
-        dbsession.add(owner)
-        dbsession.flush()
-
-    assert not is_pr_billing_plan(owner.plan)
-
-
-@override_settings(IS_ENTERPRISE=True)
-def test_pr_author_enterprise_plan_check_non_pr_plan(dbsession, mock_configuration):
-    owner = OwnerFactory(service="github")
-    if dbsession is not None:
-        dbsession.add(owner)
-        dbsession.flush()
-
-    encrypted_license = "0dRbhbzp8TVFQp7P4e2ES9lSfyQlTo8J7LQ"
-    mock_configuration.params["setup"]["enterprise_license"] = encrypted_license
-    mock_configuration.params["setup"]["codecov_dashboard_url"] = (
-        "https://codeov.mysite.com"
-    )
-
-    assert not is_pr_billing_plan(owner.plan)
-
-
-def test_billing_enums():
-    assert BillingPlan.users_monthly.db_name == "users-inappm"
-    assert BillingPlan.users_yearly.db_name == "users-inappy"
-    assert BillingPlan.users_free.db_name == "users-free"
-    assert BillingPlan.users_basic.db_name == "users-basic"
-    assert BillingPlan.pr_monthly.db_name == "users-pr-inappm"
-    assert BillingPlan.pr_yearly.db_name == "users-pr-inappy"
-    assert BillingPlan.enterprise_cloud_yearly.db_name == "users-enterprisey"
-    assert BillingPlan.enterprise_cloud_monthly.db_name == "users-enterprisem"
-    assert BillingPlan.team_monthly.db_name == "users-teamm"
-    assert BillingPlan.team_yearly.db_name == "users-teamy"
-
-
-def test_get_from_string():
-    assert BillingPlan.from_str("users-inappm") == BillingPlan.users_monthly
-    assert BillingPlan.from_str("users-inappy") == BillingPlan.users_yearly
-    assert BillingPlan.from_str("users-free") == BillingPlan.users_free
-    assert BillingPlan.from_str("users-basic") == BillingPlan.users_basic
-    assert BillingPlan.from_str("users-pr-inappm") == BillingPlan.pr_monthly
-    assert BillingPlan.from_str("users-pr-inappy") == BillingPlan.pr_yearly
-    assert (
-        BillingPlan.from_str("users-enterprisey") == BillingPlan.enterprise_cloud_yearly
-    )
-    assert (
-        BillingPlan.from_str("users-enterprisem")
-        == BillingPlan.enterprise_cloud_monthly
-    )
-    assert BillingPlan.from_str("users-teamm") == BillingPlan.team_monthly
-    assert BillingPlan.from_str("users-teamy") == BillingPlan.team_yearly
-
-
-def test_is_enterprise_cloud_plan():
-    assert not is_enterprise_cloud_plan(BillingPlan.pr_monthly)
-    assert not is_enterprise_cloud_plan(BillingPlan.pr_yearly)
-    assert is_enterprise_cloud_plan(BillingPlan.enterprise_cloud_yearly)
-    assert is_enterprise_cloud_plan(BillingPlan.enterprise_cloud_monthly)
diff --git a/tests/unit/test_router.py b/tests/unit/test_router.py
index c5b5a60a6..9f82283d4 100644
--- a/tests/unit/test_router.py
+++ b/tests/unit/test_router.py
@@ -1,59 +1,73 @@
 from unittest.mock import patch
 
-from shared.billing import BillingPlan
+import pytest
+
 from shared.celery_config import timeseries_backfill_task_name, upload_task_name
 from shared.celery_router import route_tasks_based_on_user_plan
+from shared.plan.constants import DEFAULT_FREE_PLAN, PlanName
+from tests.helper import mock_all_plans_and_tiers
 
 
-def test_route_tasks_based_on_user_plan_defaults():
-    assert route_tasks_based_on_user_plan(
-        upload_task_name, BillingPlan.users_basic.db_name
-    ) == {"queue": "celery", "extra_config": {}}
-    assert route_tasks_based_on_user_plan(
-        upload_task_name, BillingPlan.enterprise_cloud_monthly.db_name
-    ) == {"queue": "enterprise_celery", "extra_config": {}}
-    assert route_tasks_based_on_user_plan(
-        "misterious_task", BillingPlan.users_basic.db_name
-    ) == {"queue": "celery", "extra_config": {}}
-    assert route_tasks_based_on_user_plan(
-        "misterious_task", BillingPlan.enterprise_cloud_monthly.db_name
-    ) == {"queue": "enterprise_celery", "extra_config": {}}
-
-
-def test_route_tasks_with_config(mock_configuration):
-    mock_configuration._params["setup"] = {
-        "tasks": {
-            "celery": {"enterprise": {"soft_timelimit": 100, "hard_timelimit": 200}},
-            "timeseries": {
-                "enterprise": {"soft_timelimit": 400, "hard_timelimit": 500}
-            },
+class TestCeleryRouter:
+    @pytest.mark.django_db
+    def test_route_tasks_based_on_user_plan_defaults(self):
+        mock_all_plans_and_tiers()
+        assert route_tasks_based_on_user_plan(upload_task_name, DEFAULT_FREE_PLAN) == {
+            "queue": "celery",
+            "extra_config": {},
         }
-    }
-    assert route_tasks_based_on_user_plan(
-        upload_task_name, BillingPlan.users_basic.db_name
-    ) == {"queue": "celery", "extra_config": {}}
-    assert route_tasks_based_on_user_plan(
-        upload_task_name, BillingPlan.enterprise_cloud_monthly.db_name
-    ) == {
-        "queue": "enterprise_celery",
-        "extra_config": {"soft_timelimit": 100, "hard_timelimit": 200},
-    }
-    assert route_tasks_based_on_user_plan(
-        timeseries_backfill_task_name, BillingPlan.enterprise_cloud_monthly.db_name
-    ) == {
-        "queue": "enterprise_celery",
-        "extra_config": {"soft_timelimit": 400, "hard_timelimit": 500},
-    }
+        assert route_tasks_based_on_user_plan(
+            upload_task_name, PlanName.ENTERPRISE_CLOUD_MONTHLY.value
+        ) == {"queue": "enterprise_celery", "extra_config": {}}
+        assert route_tasks_based_on_user_plan("misterious_task", DEFAULT_FREE_PLAN) == {
+            "queue": "celery",
+            "extra_config": {},
+        }
+        assert route_tasks_based_on_user_plan(
+            "misterious_task", PlanName.ENTERPRISE_CLOUD_MONTHLY.value
+        ) == {"queue": "enterprise_celery", "extra_config": {}}
 
+    @pytest.mark.django_db
+    def test_route_tasks_with_config(self, mock_configuration):
+        mock_all_plans_and_tiers()
+        mock_configuration._params["setup"] = {
+            "tasks": {
+                "celery": {
+                    "enterprise": {"soft_timelimit": 100, "hard_timelimit": 200}
+                },
+                "timeseries": {
+                    "enterprise": {"soft_timelimit": 400, "hard_timelimit": 500}
+                },
+            }
+        }
+        assert route_tasks_based_on_user_plan(upload_task_name, DEFAULT_FREE_PLAN) == {
+            "queue": "celery",
+            "extra_config": {},
+        }
+        assert route_tasks_based_on_user_plan(
+            upload_task_name, PlanName.ENTERPRISE_CLOUD_MONTHLY.value
+        ) == {
+            "queue": "enterprise_celery",
+            "extra_config": {"soft_timelimit": 100, "hard_timelimit": 200},
+        }
+        assert route_tasks_based_on_user_plan(
+            timeseries_backfill_task_name, PlanName.ENTERPRISE_CLOUD_MONTHLY.value
+        ) == {
+            "queue": "enterprise_celery",
+            "extra_config": {"soft_timelimit": 400, "hard_timelimit": 500},
+        }
 
-@patch.dict(
-    "shared.celery_config.BaseCeleryConfig.task_routes",
-    {"app.tasks.upload.*": {"queue": "uploads"}},
-)
-def test_route_tasks_with_glob_config(mocker):
-    assert route_tasks_based_on_user_plan(
-        upload_task_name, BillingPlan.users_basic.db_name
-    ) == {"queue": "uploads", "extra_config": {}}
-    assert route_tasks_based_on_user_plan(
-        upload_task_name, BillingPlan.enterprise_cloud_monthly.db_name
-    ) == {"queue": "enterprise_uploads", "extra_config": {}}
+    @patch.dict(
+        "shared.celery_config.BaseCeleryConfig.task_routes",
+        {"app.tasks.upload.*": {"queue": "uploads"}},
+    )
+    @pytest.mark.django_db
+    def test_route_tasks_with_glob_config(self, mocker):
+        mock_all_plans_and_tiers()
+        assert route_tasks_based_on_user_plan(upload_task_name, DEFAULT_FREE_PLAN) == {
+            "queue": "uploads",
+            "extra_config": {},
+        }
+        assert route_tasks_based_on_user_plan(
+            upload_task_name, PlanName.ENTERPRISE_CLOUD_MONTHLY.value
+        ) == {"queue": "enterprise_uploads", "extra_config": {}}