diff --git a/plinth/modules/avahi/tests/test_functional.py b/plinth/modules/avahi/tests/test_functional.py
index b73c6a29a..076c14f20 100644
--- a/plinth/modules/avahi/tests/test_functional.py
+++ b/plinth/modules/avahi/tests/test_functional.py
@@ -5,26 +5,12 @@ Functional, browser based tests for avahi app.
 
 import pytest
 
-from plinth.tests import functional
+from plinth.tests.functional import BaseAppTests
 
 pytestmark = [pytest.mark.system, pytest.mark.essential, pytest.mark.avahi]
 
 
-@pytest.fixture(scope='module', autouse=True)
-def fixture_background(session_browser):
-    """Login and install the app."""
-    functional.login(session_browser)
-    functional.install(session_browser, 'avahi')
-    yield
-    functional.app_disable(session_browser, 'avahi')
-
-
-def test_enable_disable(session_browser):
-    """Test enabling the app."""
-    functional.app_disable(session_browser, 'avahi')
-
-    functional.app_enable(session_browser, 'avahi')
-    assert functional.service_is_running(session_browser, 'avahi')
-
-    functional.app_disable(session_browser, 'avahi')
-    assert functional.service_is_not_running(session_browser, 'avahi')
+class TestAvahiApp(BaseAppTests):
+    app_name = 'avahi'
+    has_service = True
+    has_web = False