diff --git a/tests/integration/Form/Util/FieldNameObfuscatorTest.php b/tests/unit/Form/Util/FieldNameObfuscatorTest.php
similarity index 93%
rename from tests/integration/Form/Util/FieldNameObfuscatorTest.php
rename to tests/unit/Form/Util/FieldNameObfuscatorTest.php
index 3fd78e37c1..85954ba8f4 100644
--- a/tests/integration/Form/Util/FieldNameObfuscatorTest.php
+++ b/tests/unit/Form/Util/FieldNameObfuscatorTest.php
@@ -2,7 +2,7 @@
 
 namespace MailPoet\Form\Util;
 
-class FieldNameObfuscatorTest extends \MailPoetTest {
+class FieldNameObfuscatorTest extends \MailPoetUnitTest {
 
   public function testObfuscateWorks() {
     $obfuscator = new FieldNameObfuscator();
diff --git a/tests/integration/Form/Util/StylesTest.php b/tests/unit/Form/Util/StylesTest.php
similarity index 96%
rename from tests/integration/Form/Util/StylesTest.php
rename to tests/unit/Form/Util/StylesTest.php
index 9577e5f633..63d4f732cb 100644
--- a/tests/integration/Form/Util/StylesTest.php
+++ b/tests/unit/Form/Util/StylesTest.php
@@ -3,7 +3,7 @@ namespace MailPoet\Test\Form\Util;
 
 use MailPoet\Form\Util\Styles;
 
-class StylesTest extends \MailPoetTest {
+class StylesTest extends \MailPoetUnitTest {
   function testItSetsDefaultCSSStyles() {
     expect(property_exists('MailPoet\Form\Util\Styles', 'default_styles'))->true();
     expect(Styles::$default_styles)->notEmpty();
diff --git a/tests/unit/Newsletter/Renderer/StylesHelperTest.php b/tests/unit/Newsletter/Renderer/StylesHelperTest.php
index b4daea99c7..40bd76ce70 100644
--- a/tests/unit/Newsletter/Renderer/StylesHelperTest.php
+++ b/tests/unit/Newsletter/Renderer/StylesHelperTest.php
@@ -3,7 +3,7 @@ namespace MailPoet\Test\Newsletter;
 
 use MailPoet\Newsletter\Renderer\StylesHelper;
 
-class StylesHelperTest extends \MailPoetTest {
+class StylesHelperTest extends \MailPoetUnitTest {
 
   function testItGetsCustomFontsLinks() {
     $styles_with_custom_fonts = [
diff --git a/tests/integration/Settings/CharsetsTest.php b/tests/unit/Settings/CharsetsTest.php
similarity index 83%
rename from tests/integration/Settings/CharsetsTest.php
rename to tests/unit/Settings/CharsetsTest.php
index 98d9547fed..02eda6e4fe 100644
--- a/tests/integration/Settings/CharsetsTest.php
+++ b/tests/unit/Settings/CharsetsTest.php
@@ -3,7 +3,7 @@ namespace MailPoet\Test\Settings;
 
 use MailPoet\Settings\Charsets;
 
-class CharsetsTest extends \MailPoetTest {
+class CharsetsTest extends \MailPoetUnitTest {
   function testItReturnsAListOfCharsets() {
     $charsets = Charsets::getAll();
     expect($charsets)->notEmpty();
diff --git a/tests/integration/Settings/HostsTest.php b/tests/unit/Settings/HostsTest.php
similarity index 93%
rename from tests/integration/Settings/HostsTest.php
rename to tests/unit/Settings/HostsTest.php
index b061307a68..b6a195d154 100644
--- a/tests/integration/Settings/HostsTest.php
+++ b/tests/unit/Settings/HostsTest.php
@@ -3,7 +3,7 @@ namespace MailPoet\Test\Settings;
 
 use MailPoet\Settings\Hosts;
 
-class HostsTest extends \MailPoetTest {
+class HostsTest extends \MailPoetUnitTest {
   function testItReturnsAListOfWebHosts() {
     $web_hosts = Hosts::getWebHosts();
     expect($web_hosts)->notEmpty();
diff --git a/tests/integration/Util/CSSTest.php b/tests/unit/Util/CSSTest.php
similarity index 84%
rename from tests/integration/Util/CSSTest.php
rename to tests/unit/Util/CSSTest.php
index 29c44e0f29..3110d62463 100644
--- a/tests/integration/Util/CSSTest.php
+++ b/tests/unit/Util/CSSTest.php
@@ -1,7 +1,7 @@
 <?php
 namespace MailPoet\Test\Util;
 
-class CSSTest extends \MailPoetTest {
+class CSSTest extends \MailPoetUnitTest {
   public function _before() {
     $this->css = new \MailPoet\Util\CSS();
   }
diff --git a/tests/integration/Util/DOMTest.php b/tests/unit/Util/DOMTest.php
similarity index 95%
rename from tests/integration/Util/DOMTest.php
rename to tests/unit/Util/DOMTest.php
index 12b3698f22..dca81836de 100644
--- a/tests/integration/Util/DOMTest.php
+++ b/tests/unit/Util/DOMTest.php
@@ -4,7 +4,7 @@ namespace MailPoet\Test\Util;
 use pQuery;
 use MailPoet\Util\DOM as DOMUtil;
 
-class DOMTest extends \MailPoetTest {
+class DOMTest extends \MailPoetUnitTest {
 
   function _before() {
     $this->root = pQuery::parseStr('<p><i>italic</i><em>previous text<a href="#mylink"><img src="#myimage" /></a>next text</em><b>bolded</b></p>');
diff --git a/tests/integration/Util/HelpersTest.php b/tests/unit/Util/HelpersTest.php
similarity index 97%
rename from tests/integration/Util/HelpersTest.php
rename to tests/unit/Util/HelpersTest.php
index c18d2ebb09..a844d3691c 100644
--- a/tests/integration/Util/HelpersTest.php
+++ b/tests/unit/Util/HelpersTest.php
@@ -3,7 +3,7 @@ namespace MailPoet\Test\Util;
 
 use MailPoet\Util\Helpers;
 
-class HelpersTest extends \MailPoetTest {
+class HelpersTest extends \MailPoetUnitTest {
   function testItReplacesLinkTags() {
     $source = '[link]example link[/link]';
     $link = 'http://example.com';
diff --git a/tests/integration/Util/License/LicenseTest.php b/tests/unit/Util/License/LicenseTest.php
similarity index 85%
rename from tests/integration/Util/License/LicenseTest.php
rename to tests/unit/Util/License/LicenseTest.php
index e408297af8..6cbf780ae8 100644
--- a/tests/integration/Util/License/LicenseTest.php
+++ b/tests/unit/Util/License/LicenseTest.php
@@ -3,7 +3,7 @@ namespace MailPoet\Test\Util\License;
 
 use MailPoet\Util\License\License;
 
-class LicenseTest extends \MailPoetTest {
+class LicenseTest extends \MailPoetUnitTest {
   function testItGetsLicense() {
     if(defined('MAILPOET_PREMIUM_LICENSE')) return;
     expect(License::getLicense())->false();
diff --git a/tests/integration/Util/PQueryTest.php b/tests/unit/Util/PQueryTest.php
similarity index 99%
rename from tests/integration/Util/PQueryTest.php
rename to tests/unit/Util/PQueryTest.php
index 64f5ee26fc..e49ffeae32 100644
--- a/tests/integration/Util/PQueryTest.php
+++ b/tests/unit/Util/PQueryTest.php
@@ -3,7 +3,7 @@ namespace MailPoet\Test\Util;
 
 use MailPoet\Util\pQuery\pQuery;
 
-class PQueryTest extends \MailPoetTest {
+class PQueryTest extends \MailPoetUnitTest {
   function testBreakingQuoteAreNotRendered() {
     $html = '<a href="#" title="Escape " this"></a>';
     $domnode = pQuery::parseStr($html);
diff --git a/tests/integration/Util/XlsxWriterTest.php b/tests/unit/Util/XlsxWriterTest.php
similarity index 80%
rename from tests/integration/Util/XlsxWriterTest.php
rename to tests/unit/Util/XlsxWriterTest.php
index 20be6c325f..261ec871a8 100644
--- a/tests/integration/Util/XlsxWriterTest.php
+++ b/tests/unit/Util/XlsxWriterTest.php
@@ -1,7 +1,7 @@
 <?php
 namespace MailPoet\Test\Util;
 
-class XlsxWriterTest extends \MailPoetTest {
+class XlsxWriterTest extends \MailPoetUnitTest {
 
   public function _before() {
   }
diff --git a/tests/integration/WP/PostsTest.php b/tests/unit/WP/PostsTest.php
similarity index 97%
rename from tests/integration/WP/PostsTest.php
rename to tests/unit/WP/PostsTest.php
index 20e7fee11b..6171a0f3b4 100644
--- a/tests/integration/WP/PostsTest.php
+++ b/tests/unit/WP/PostsTest.php
@@ -4,7 +4,7 @@ namespace MailPoet\Test\WP;
 use Helper\WordPress as WordPressHelper;
 use MailPoet\WP\Posts;
 
-class PostsTest extends \MailPoetTest {
+class PostsTest extends \MailPoetUnitTest {
 
   function testGetTermsProxiesCallToWordPress() {
     $args = array(
diff --git a/tests/unit/WP/ReadmeTest.php b/tests/unit/WP/ReadmeTest.php
index d62b8633e5..a7ba09ab0f 100644
--- a/tests/unit/WP/ReadmeTest.php
+++ b/tests/unit/WP/ReadmeTest.php
@@ -3,7 +3,7 @@ namespace MailPoet\Test\WP;
 
 use MailPoet\WP\Readme;
 
-class ReadmeTest extends \MailPoetTest {
+class ReadmeTest extends \MailPoetUnitTest {
   function _before() {
     // Sample taken from https://wordpress.org/plugins/about/readme.txt
     $this->data = file_get_contents(dirname(__FILE__) . '/ReadmeTestData.txt');
diff --git a/tests/unit/_bootstrap.php b/tests/unit/_bootstrap.php
index 7431bd0e6e..05db8fb3e6 100644
--- a/tests/unit/_bootstrap.php
+++ b/tests/unit/_bootstrap.php
@@ -2,7 +2,7 @@
 
 $console = new \Codeception\Lib\Console\Output([]);
 
-abstract class MailPoetTest extends \Codeception\TestCase\Test {
+abstract class MailPoetUnitTest extends \Codeception\TestCase\Test {
   protected $runTestInSeparateProcess = false;
   protected $preserveGlobalState = false;
 }
diff --git a/tests/unit/_fixtures.php b/tests/unit/_fixtures.php
index c536c31f3f..60aea6629e 100644
--- a/tests/unit/_fixtures.php
+++ b/tests/unit/_fixtures.php
@@ -165,18 +165,3 @@ Fixtures::add(
     ),
   )
 );
-
-/**
- * Simple class mocking dynamic segment filter.
- */
-class DynamicSegmentFilter {
-  protected $ids;
-
-  function __construct($ids) {
-    $this->ids = $ids;
-  }
-
-  public function toSql($orm) {
-    return $orm->whereIn(Subscriber::$_table . '.id', $this->ids);
-  }
-}
\ No newline at end of file