diff --git a/tests/UI/ContainerVersion_spec.js b/tests/UI/ContainerVersion_spec.js
index 2adbd0dea..57fb11d3a 100644
--- a/tests/UI/ContainerVersion_spec.js
+++ b/tests/UI/ContainerVersion_spec.js
@@ -118,7 +118,7 @@ describe("ContainerVersion", function () {
         await capture.page(page, 'create_new_shown_in_list');
     });
 
-    it('should be possible to publish new version', async function () {
+    it('should be possible to fill in publish new version form', async function () {
         await page.click('.createNewVersion');
         await setVersionName('v3.0');
         await page.waitForTimeout(500);
diff --git a/tests/UI/form.js b/tests/UI/form.js
index 591b1888e..60614dc17 100644
--- a/tests/UI/form.js
+++ b/tests/UI/form.js
@@ -11,14 +11,14 @@ exports.sendFieldValue = async function (page, selector, text)
         $(selector).val('').change();
     }, selector);
 
-    await page.waitForTimeout(100);
+    await page.waitForFunction("$('" + selector + "').val() == ''");
     // page.sendKeys(selector, text);
 
     await page.evaluate((selector, text) => {
         $(selector).val(text).change();
     }, selector, text);
 
-    await page.waitForTimeout(200);
+  await page.waitForFunction("$('" + selector + "').val() != ''");
 };
 exports.selectValue = async function (page, field, title)
 {