diff --git a/functional_tests/support/system.py b/functional_tests/support/system.py
index 58735ea03..3171d7e4c 100644
--- a/functional_tests/support/system.py
+++ b/functional_tests/support/system.py
@@ -74,12 +74,12 @@ def check_language(browser, language_code):
 
 def delete_all_snapshots(browser):
     browser.visit(config['DEFAULT']['url'] + '/plinth/sys/snapshot/all/delete')
-    browser.find_by_value('Delete Snapshots').click()
+    submit(browser)
 
 
 def create_snapshot(browser):
     browser.visit(config['DEFAULT']['url'] + '/plinth/sys/snapshot/manage/')
-    browser.find_by_value('Create Snapshot').click()
+    submit(browser)  # Click on 'Create Snapshot'
 
 
 def get_snapshot_count(browser):