diff --git a/tests/DataFactories/Form.php b/tests/DataFactories/Form.php
index 71973eb0f8..b36316186d 100644
--- a/tests/DataFactories/Form.php
+++ b/tests/DataFactories/Form.php
@@ -12,7 +12,7 @@ class Form {
     $this->data = [
       'name' => 'New form',
       'body' => 'a:2:{i:0;a:5:{s:2:"id";s:5:"email";s:4:"name";s:5:"Email";s:4:"type";s:4:"text";s:6:"static";b:1;s:6:"params";a:2:{s:5:"label";s:5:"Email";s:8:"required";b:1;}}i:1;a:5:{s:2:"id";s:6:"submit";s:4:"name";s:6:"Submit";s:4:"type";s:6:"submit";s:6:"static";b:1;s:6:"params";a:1:{s:5:"label";s:10:"Subscribe!";}}}',
-      'settings' => 'a:4:{s:10:"on_success";s:7:"message";s:15:"success_message";s:61:"Check your inbox or spam folder to confirm your subscription.";s:8:"segments";N;s:20:"segments_selected_by";s:5:"admin";}',
+      'settings' => 'a:4:{s:10:"on_success";s:7:"message";s:15:"success_message";s:61:"Check your inbox or spam folder to confirm your subscription.";s:8:"segments";a:1:{i:0;s:1:"2";}s:20:"segments_selected_by";s:5:"admin";}',
       'created_at' => Carbon::now(),
       'updated_at' => Carbon::now(),
     ];
@@ -28,8 +28,9 @@ class Form {
     return $this;
   }
 
+  /** @return \MailPoet\Models\Form */
   public function create() {
-    \MailPoet\Models\Form::createOrUpdate($this->data);
+    return \MailPoet\Models\Form::createOrUpdate($this->data);
   }
 
 }
diff --git a/tests/acceptance/SubscriptionFormCest.php b/tests/acceptance/SubscriptionFormCest.php
index a90263d49f..f37319bc36 100644
--- a/tests/acceptance/SubscriptionFormCest.php
+++ b/tests/acceptance/SubscriptionFormCest.php
@@ -3,6 +3,9 @@
 namespace MailPoet\Test\Acceptance;
 
 use Codeception\Util\Locator;
+use MailPoet\Test\DataFactories\Form;
+
+require_once __DIR__ . '/../DataFactories/Form.php';
 
 class SubscriptionFormCest {
   const CONFIRMATION_MESSAGE_TIMEOUT = 20;
@@ -12,9 +15,12 @@ class SubscriptionFormCest {
   }
 
   function subscriptionFormWidget(\AcceptanceTester $I) {
+    $form_name = 'Subscription Acceptance Test Form';
+    $form_factory = new Form();
+    $form = $form_factory->withName($form_name)->create();
     $I->wantTo('Subscribe using form widget');
 
-    $I->cli('widget add mailpoet_form sidebar-1 2 --form=1 --title="Subscribe to Our Newsletter" --allow-root');
+    $I->cli('widget add mailpoet_form sidebar-1 2 --form=' . $form->id . ' --title="Subscribe to Our Newsletter" --allow-root');
 
     $I->amOnPage('/');
     $I->fillField('[data-automation-id=\'form_email\']', $this->subscriber_email);
@@ -69,4 +75,4 @@ class SubscriptionFormCest {
   function _after(\AcceptanceTester $I) {
     $I->cli('db query "TRUNCATE TABLE mp_mailpoet_subscriber_ips" --allow-root');
   }
-}
\ No newline at end of file
+}