diff --git a/functional_tests/features/date_and_time.feature b/functional_tests/features/date_and_time.feature
index 73bb39c54..6c8ed3419 100644
--- a/functional_tests/features/date_and_time.feature
+++ b/functional_tests/features/date_and_time.feature
@@ -15,7 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-@essential @date-and-time @system @backups
+@essential @date_and_time @system @backups
 Feature: Date and Time
   Configure time zone and network time service.
 
diff --git a/functional_tests/features/i2p.feature b/functional_tests/features/i2p.feature
index 4b27ad189..66ebea0a4 100644
--- a/functional_tests/features/i2p.feature
+++ b/functional_tests/features/i2p.feature
@@ -15,7 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-@apps @i2p-app
+@apps @i2p
 Feature: I2P Anonymity Network
   Manage I2P configuration.
 
diff --git a/functional_tests/features/service_discovery.feature b/functional_tests/features/service_discovery.feature
index 4cdfd3d20..a1a990b8b 100644
--- a/functional_tests/features/service_discovery.feature
+++ b/functional_tests/features/service_discovery.feature
@@ -15,7 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-@system @essential @service-discovery
+@system @essential @service_discovery
 Feature: Service Discovery
   Configure service discovery.
 
diff --git a/functional_tests/features/tor.feature b/functional_tests/features/tor.feature
index e03123b1c..c57dfbecf 100644
--- a/functional_tests/features/tor.feature
+++ b/functional_tests/features/tor.feature
@@ -15,7 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-@apps @tor-app @backups
+@apps @tor @backups
 Feature: Tor Anonymity Network
   Manage Tor configuration.
 
diff --git a/functional_tests/features/users_and_groups.feature b/functional_tests/features/users_and_groups.feature
index f93bee767..c0feb9a36 100644
--- a/functional_tests/features/users_and_groups.feature
+++ b/functional_tests/features/users_and_groups.feature
@@ -15,7 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-@system @essential @users-groups
+@system @essential @users_groups
 Feature: Users and Groups
   Manage users and groups.
 
diff --git a/pytest.ini b/pytest.ini
index d07567e8a..f557054cf 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -1,3 +1,50 @@
 [pytest]
 DJANGO_SETTINGS_MODULE = plinth.tests.data.django_test_settings
 markers = functional
+    apps
+    backups
+    bind
+    configuration
+    coquelicot
+    date_and_time
+    deluge
+    dynamicdns
+    ejabberd
+    essential
+    gitweb
+    help
+    i2p
+    ikiwiki
+    infinoted
+    jsxc
+    matrixsynapse
+    mediawiki
+    minetest
+    mldonkey
+    monkeysphere
+    mumble
+    openvpn
+    pagekite
+    privoxy
+    quassel
+    radicale
+    roundcube
+    samba
+    searx
+    security
+    service_discovery
+    shadowsocks
+    sharing
+    sip
+    skip
+    snapshot
+    ssh
+    sso
+    syncthing
+    system
+    tahoe
+    tor
+    transmission
+    ttrss
+    upgrades
+    users_groups