diff --git a/plinth/modules/networks/templates/connections_create.html b/plinth/modules/networks/templates/connections_create.html
index 3e2a6651d..84d7b81be 100644
--- a/plinth/modules/networks/templates/connections_create.html
+++ b/plinth/modules/networks/templates/connections_create.html
@@ -10,7 +10,7 @@
 
   <h3>{{ title }}</h3>
 
-  <form class="form" method="post">
+  <form class="form form-connection-create" method="post">
     {% csrf_token %}
 
     {{ form|bootstrap }}
diff --git a/plinth/modules/networks/templates/connections_edit.html b/plinth/modules/networks/templates/connections_edit.html
index c61ec1c69..3cecdd54a 100644
--- a/plinth/modules/networks/templates/connections_edit.html
+++ b/plinth/modules/networks/templates/connections_edit.html
@@ -11,7 +11,7 @@
 
   <h3>{{ title }}</h3>
 
-  <form class="form" method="post">
+  <form class="form form-connection-edit" method="post">
     {% csrf_token %}
 
     {{ form|bootstrap }}
diff --git a/plinth/tests/functional/__init__.py b/plinth/tests/functional/__init__.py
index a8e601d46..26a74b2d9 100644
--- a/plinth/tests/functional/__init__.py
+++ b/plinth/tests/functional/__init__.py
@@ -566,7 +566,7 @@ def networks_set_firewall_zone(browser, zone):
     edit_url = "/plinth/sys/networks/{}/edit/".format(network_id)
     browser.links.find_by_href(edit_url).first.click()
     browser.select('zone', zone)
-    browser.find_by_tag("form").first.find_by_tag('input')[-1].click()
+    submit(browser, form_class='form-connection-edit')
 
 
 ##################