diff --git a/tests/UI/ContainerVersion_spec.js b/tests/UI/ContainerVersion_spec.js
index d78ef61c..44f0c150 100644
--- a/tests/UI/ContainerVersion_spec.js
+++ b/tests/UI/ContainerVersion_spec.js
@@ -153,7 +153,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);
@@ -234,6 +234,7 @@ describe("ContainerVersion", function () {
     it('should open create version page when clicking on create a version now link', async function () {
         await page.click('.createContainerVersionNow');
         await capture.setTableRowHeight(page);
+        await page.waitForTimeout(250); // loading element sometimes needs longer to be fully hidden
         pageWrap = await page.$('#content');
         expect(await pageWrap.screenshot()).to.matchImage('version_none_exist_yet_create_now');
     });
diff --git a/tests/UI/form.js b/tests/UI/form.js
index 598d888b..c929e29f 100644
--- a/tests/UI/form.js
+++ b/tests/UI/form.js
@@ -5,27 +5,27 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
 
-exports.sendFieldValue = async function (page, selector, text)
-{
-    await page.evaluate((selector) => {
-        $(selector).val('').change();
-    }, selector);
+exports.sendFieldValue = async function (page, selector, text) {
+  await page.evaluate((selector) => {
+    $(selector).val('').change();
+  }, selector);
 
-    // page.sendKeys(selector, text);
+  await page.waitForFunction(() => $(selector).val() === '');
 
-    await page.evaluate((selector, text) => {
-        $(selector).val(text).change();
-    }, selector, text);
+  await page.evaluate((selector, text) => {
+    $(selector).val(text).change();
+  }, selector, text);
 
-    await page.waitForTimeout(200);
+  await page.waitForFunction(() => $(selector).val() === text);
 };
-exports.selectValue = async function (page, field, title)
-{
-    await page.evaluate((field) => {
-        $(field + ' input.select-dropdown').click()
-    }, field);
-    await page.waitForTimeout(800);
-    await page.evaluate((field, title) => {
-        $(field + ' .dropdown-content li:contains("' + title + '"):first').click()
-    }, field, title);
+exports.selectValue = async function (page, field, title) {
+  await page.evaluate((field) => {
+    $(field + ' input.select-dropdown').click()
+  }, field);
+
+  await page.waitForFunction(() => $(field + ' .dropdown-content li:contains("' + title + '")').length() > 0);
+
+  await page.evaluate((field, title) => {
+    $(field + ' .dropdown-content li:contains("' + title + '"):first').click()
+  }, field, title);
 };