diff --git a/tests/DataFactories/Settings.php b/tests/DataFactories/Settings.php
index 76d857424a..0f77731472 100644
--- a/tests/DataFactories/Settings.php
+++ b/tests/DataFactories/Settings.php
@@ -41,4 +41,12 @@ class Settings {
     Setting::setValue('tracking.enabled', false);
     return $this;
   }
+
+  function withSkippedTutorials() {
+    Setting::setValue('show_intro', 0);
+    Setting::setValue('display_nps_poll', 0);
+    Setting::setValue('user_seen_editor_tutorial1', 1);
+    Setting::setValue('show_congratulate_after_first_newsletter', 0);
+    return $this;
+  }
 }
diff --git a/tests/acceptance/ReinstallFromScratchCest.php b/tests/acceptance/ReinstallFromScratchCest.php
index 831d11e80f..bbe7b72cb7 100644
--- a/tests/acceptance/ReinstallFromScratchCest.php
+++ b/tests/acceptance/ReinstallFromScratchCest.php
@@ -2,16 +2,17 @@
 
 namespace MailPoet\Test\Acceptance;
 
-use MailPoet\Models\Setting;
 use MailPoet\Test\DataFactories\Form;
 use MailPoet\Test\DataFactories\Newsletter;
 use MailPoet\Test\DataFactories\Segment;
+use MailPoet\Test\DataFactories\Settings;
 use MailPoet\Test\DataFactories\Subscriber;
 use PHPUnit_Framework_Assert as Asserts;
 
 require_once __DIR__ . '/../DataFactories/Form.php';
 require_once __DIR__ . '/../DataFactories/Newsletter.php';
 require_once __DIR__ . '/../DataFactories/Segment.php';
+require_once __DIR__ . '/../DataFactories/Settings.php';
 require_once __DIR__ . '/../DataFactories/Subscriber.php';
 
 class ReinstallFromScratchCest {
@@ -43,9 +44,8 @@ class ReinstallFromScratchCest {
     $I->waitForElementNotVisible('#mailpoet_loading', 10);
 
     // Step 3 - skip all tutorials, which could interfere with other tests
-    Setting::setValue('show_intro', 0);
-    Setting::setValue('user_seen_editor_tutorial1', 1);
-    Setting::setValue('show_congratulate_after_first_newsletter', 0);
+    $settings = new Settings();
+    $settings->withSkippedTutorials();
 
     // Step 4 - check if data are emptied and repopulated
     // Check emails