diff --git a/allianceauth/groupmanagement/tests/test_views.py b/allianceauth/groupmanagement/tests/test_views.py
index e0c9245b..9cc23587 100644
--- a/allianceauth/groupmanagement/tests/test_views.py
+++ b/allianceauth/groupmanagement/tests/test_views.py
@@ -64,7 +64,7 @@ class TestViews(TestCase):
         content = response_content_to_str(response)
 
         self.assertEqual(response.status_code, 200)
-        self.assertIn('<a data-toggle="tab" href="#leave">', content)
+        self.assertIn('id="leave-tab" data-bs-toggle="tab" data-bs-target="#leave"', content)
         self.assertIn('<div id="leave" class="tab-pane">', content)
 
     @override_settings(GROUPMANAGEMENT_AUTO_LEAVE=True)
@@ -81,5 +81,5 @@ class TestViews(TestCase):
         content = response_content_to_str(response)
 
         self.assertEqual(response.status_code, 200)
-        self.assertNotIn('<a data-toggle="tab" href="#leave">', content)
+        self.assertNotIn('id="leave-tab" data-bs-toggle="tab" data-bs-target="#leave"', content)
         self.assertNotIn('<div id="leave" class="tab-pane">', content)
diff --git a/allianceauth/permissions_tool/tests.py b/allianceauth/permissions_tool/tests.py
index 97f8e7b4..97222d67 100644
--- a/allianceauth/permissions_tool/tests.py
+++ b/allianceauth/permissions_tool/tests.py
@@ -3,7 +3,7 @@ from django import urls
 from django.contrib.auth.models import Group, Permission
 
 from allianceauth.tests.auth_utils import AuthUtils
-
+from allianceauth.menu.models import MenuItem
 
 class PermissionsToolViewsTestCase(WebTest):
     def setUp(self):
@@ -34,13 +34,19 @@ class PermissionsToolViewsTestCase(WebTest):
         self.member.user_permissions.add(self.permission)
         AuthUtils.connect_signals()
 
+        # TODO find a nicer way to do this later
+        MenuItem.sync_hook_models()
+
     def test_menu_item(self):
+        # If we change the side menu again this will fail again.
         self.app.set_user(self.member)
         response = self.app.get(urls.reverse('permissions_tool:overview'))
 
-        response_content = response.content.decode('utf-8')
+        response_content = response.content.decode(response.charset)
 
-        self.assertInHTML('<li><a class="active" href="/permissions/overview/"><i class="fas fa-id-card fa-fw"></i> Permissions Audit</a></li>', response_content)
+        self.assertIn("fa-id-card", response_content)
+        self.assertIn('href="/permissions/overview/"', response_content)
+        self.assertIn("Permissions Audit", response_content)
 
     def test_permissions_overview(self):
         self.app.set_user(self.member)
diff --git a/allianceauth/timerboard/tests.py b/allianceauth/timerboard/tests.py
index 8b76890b..715f3d61 100644
--- a/allianceauth/timerboard/tests.py
+++ b/allianceauth/timerboard/tests.py
@@ -98,7 +98,7 @@ class TimerboardViewsTestCase(WebTest):
 
         response = self.app.get(self.view_url)
 
-        context = response.context[-1]
+        context = response.context
 
         timers = context['timers']
         corp_timers = context['corp_timers']
diff --git a/allianceauth/timerboard/views.py b/allianceauth/timerboard/views.py
index 91912a9f..0ac11446 100644
--- a/allianceauth/timerboard/views.py
+++ b/allianceauth/timerboard/views.py
@@ -67,6 +67,7 @@ class AddUpdateMixin:
 
 class AddTimerView(TimerManagementView, AddUpdateMixin, CreateView):
     template_name_suffix = '_create_form'
+    form_class = TimerForm
 
     def form_valid(self, form):
         result = super().form_valid(form)
@@ -78,6 +79,7 @@ class AddTimerView(TimerManagementView, AddUpdateMixin, CreateView):
 
 class EditTimerView(TimerManagementView, AddUpdateMixin, UpdateView):
     template_name_suffix = '_update_form'
+    form_class = TimerForm
 
     def form_valid(self, form):
         messages.success(self.request, _('Saved changes to the timer.'))
@@ -85,7 +87,7 @@ class EditTimerView(TimerManagementView, AddUpdateMixin, UpdateView):
 
 
 class RemoveTimerView(TimerManagementView, DeleteView):
-    pass
+    form_class = TimerForm
 
 
 def dashboard_timers(request):