diff --git a/frontend/test/__support__/integrated_tests.js b/frontend/test/__support__/integrated_tests.js
index cfb5fd26b894cf27e877f5b18653495f767f2a72..8ad4814f81e8a0c7affe9a4fab8b12f25003ca10 100644
--- a/frontend/test/__support__/integrated_tests.js
+++ b/frontend/test/__support__/integrated_tests.js
@@ -344,13 +344,14 @@ export const clickRouterLink = click
 
 export const clickButton = (enzymeWrapper) => {
     const closestButton = enzymeWrapper.closest("button");
-    // const childButton = enzymeWrapper.children("button");
 
     if (closestButton.length === 1) {
         closestButton.simulate("submit"); // for forms with onSubmit
         closestButton.simulate("click"); // for lone buttons / forms without onSubmit
     } else {
-        throw new Error('Couldn\'t find a button element to click in clickButton');
+        // Assume that the current component wraps a button element
+        enzymeWrapper.simulate("submit");
+        enzymeWrapper.simulate("click");
     }
 }
 
diff --git a/frontend/test/admin/datamodel/FieldApp.integ.spec.js b/frontend/test/admin/datamodel/FieldApp.integ.spec.js
index a1ef3a61220cafe97a957b96de2e7787e1b77d16..b422b33a8f28052b72f0944931eac779574da0c3 100644
--- a/frontend/test/admin/datamodel/FieldApp.integ.spec.js
+++ b/frontend/test/admin/datamodel/FieldApp.integ.spec.js
@@ -1,6 +1,6 @@
 import {
     login,
-    createTestStore,
+    createTestStore, clickButton,
 } from "__support__/integrated_tests";
 
 import {
@@ -346,8 +346,7 @@ describe("FieldApp", () => {
             lastMapping.find(Input).simulate('change', {target: {value: "Extraordinarily awesome"}});
 
             const saveButton = valueRemappingsSection.find(ButtonWithStatus)
-            // TRY WITH clickButton !!!
-            saveButton.simulate("click");
+            clickButton(saveButton)
 
             store.waitForActions([UPDATE_FIELD_VALUES]);
         });