diff --git a/plinth/modules/avahi/tests/avahi.feature b/plinth/modules/avahi/tests/avahi.feature
deleted file mode 100644
index 0ab01d1cb..000000000
--- a/plinth/modules/avahi/tests/avahi.feature
+++ /dev/null
@@ -1,18 +0,0 @@
-# SPDX-License-Identifier: AGPL-3.0-or-later
-
-@system @essential @avahi
-Feature: Avahi Service Discovery
-  Configure service discovery.
-
-Background:
-  Given I'm a logged in user
-
-Scenario: Disable avahi application
-  Given the avahi application is enabled
-  When I disable the avahi application
-  Then the avahi service should not be running
-
-Scenario: Enable avahi application
-  Given the avahi application is disabled
-  When I enable the avahi application
-  Then the avahi service should be running
diff --git a/plinth/modules/avahi/tests/test_functional.py b/plinth/modules/avahi/tests/test_functional.py
index 687c73c4f..114dd0328 100644
--- a/plinth/modules/avahi/tests/test_functional.py
+++ b/plinth/modules/avahi/tests/test_functional.py
@@ -3,6 +3,27 @@
 Functional, browser based tests for avahi app.
 """
 
-from pytest_bdd import scenarios
+import pytest
+from plinth.tests import functional
 
-scenarios('avahi.feature')
+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')