diff --git a/tests/unit/API/JSON/v1/ServicesTest.php b/tests/unit/API/JSON/v1/ServicesTest.php
index 1e06538e04..2b9826b40c 100644
--- a/tests/unit/API/JSON/v1/ServicesTest.php
+++ b/tests/unit/API/JSON/v1/ServicesTest.php
@@ -108,7 +108,7 @@ class ServicesTest extends MailPoetTest {
     );
     $response = $this->services_endpoint->checkPremiumKey($this->data);
     expect($response->status)->equals(APIResponse::STATUS_OK);
-    foreach (array_keys(Installer::getPremiumStatus()) as $key) {
+    foreach(array_keys(Installer::getPremiumStatus()) as $key) {
       expect(isset($response->meta[$key]))->true();
     }
   }
diff --git a/tests/unit/Cron/Workers/BounceTest.php b/tests/unit/Cron/Workers/BounceTest.php
index 659c482a4f..b19dd90aec 100644
--- a/tests/unit/Cron/Workers/BounceTest.php
+++ b/tests/unit/Cron/Workers/BounceTest.php
@@ -19,7 +19,7 @@ class BounceTest extends MailPoetTest {
       'good_address@example.com'
     );
 
-    foreach ($this->emails as $email) {
+    foreach($this->emails as $email) {
         Subscriber::createOrUpdate(array(
           'status' => Subscriber::STATUS_SUBSCRIBED,
           'email' => $email
diff --git a/tests/unit/Cron/Workers/SchedulerTest.php b/tests/unit/Cron/Workers/SchedulerTest.php
index 09bedbb0fa..50983ab0ec 100644
--- a/tests/unit/Cron/Workers/SchedulerTest.php
+++ b/tests/unit/Cron/Workers/SchedulerTest.php
@@ -19,7 +19,7 @@ class SchedulerTest extends MailPoetTest {
     expect(Scheduler::UNCONFIRMED_SUBSCRIBER_RESCHEDULE_TIMEOUT)->equals(5);
   }
 
- function testItConstructs() {
+  function testItConstructs() {
     $scheduler = new Scheduler();
     expect($scheduler->timer)->greaterOrEquals(5);
     $timer = microtime(true) - 2;
@@ -80,7 +80,7 @@ class SchedulerTest extends MailPoetTest {
     expect(SendingQueue::findMany())->notEmpty();
     $scheduler->deleteQueueOrUpdateNextRunDate($queue, $newsletter);
     expect(SendingQueue::findMany())->count(0);
-    }
+  }
 
   function testItCanRescheduleQueueDeliveryTime() {
     $newsletter = $this->_createNewsletter();
diff --git a/tests/unit/Cron/Workers/SendingQueue/SendingQueueTest.php b/tests/unit/Cron/Workers/SendingQueue/SendingQueueTest.php
index b4d03e0741..33f06e1fdd 100644
--- a/tests/unit/Cron/Workers/SendingQueue/SendingQueueTest.php
+++ b/tests/unit/Cron/Workers/SendingQueue/SendingQueueTest.php
@@ -114,6 +114,7 @@ class SendingQueueTest extends MailPoetTest {
       $sending_queue_worker->process();
       self::fail('Execution limits function was not called.');
     } catch(\Exception $e) {
+      // No exception handling needed
     }
   }
 
diff --git a/tests/unit/Newsletter/Scheduler/SchedulerTest.php b/tests/unit/Newsletter/Scheduler/SchedulerTest.php
index acfbf2a30e..e441e3cd2d 100644
--- a/tests/unit/Newsletter/Scheduler/SchedulerTest.php
+++ b/tests/unit/Newsletter/Scheduler/SchedulerTest.php
@@ -1,4 +1,3 @@
-
 <?php
 
 use Carbon\Carbon;
@@ -10,7 +9,7 @@ use MailPoet\Models\SendingQueue;
 use MailPoet\Newsletter\Scheduler\Scheduler;
 
 class NewsletterSchedulerTest extends MailPoetTest {
- function testItSetsConstants() {
+  function testItSetsConstants() {
     expect(Scheduler::SECONDS_IN_HOUR)->notEmpty();
     expect(Scheduler::LAST_WEEKDAY_FORMAT)->notEmpty();
     expect(Scheduler::WORDPRESS_ALL_ROLES)->notEmpty();
@@ -324,7 +323,7 @@ class NewsletterSchedulerTest extends MailPoetTest {
       'monthDay' => null,
       'nthWeekDay' => null,
       'weekDay' => null,
-      'timeOfDay' => 50400 // 14:00
+      'timeOfDay' => 50400 // 2 p.m.
     );
     Scheduler::processPostNotificationSchedule($newsletter);
     $newsletter_option = NewsletterOption::where('newsletter_id', $newsletter->id)
@@ -341,7 +340,7 @@ class NewsletterSchedulerTest extends MailPoetTest {
       'monthDay' => null,
       'nthWeekDay' => null,
       'weekDay' => Carbon::TUESDAY,
-      'timeOfDay' => 50400 // 14:00
+      'timeOfDay' => 50400 // 2 p.m.
     );
     Scheduler::processPostNotificationSchedule($newsletter);
     $current_time = Carbon::createFromTimestamp(current_time('timestamp'));
@@ -359,7 +358,7 @@ class NewsletterSchedulerTest extends MailPoetTest {
       'monthDay' => 19, // 20th (count starts from 0)
       'nthWeekDay' => null,
       'weekDay' => null,
-      'timeOfDay' => 50400 // 14:00
+      'timeOfDay' => 50400 // 2 p.m.
     );
     Scheduler::processPostNotificationSchedule($newsletter);
     $newsletter_option = NewsletterOption::where('newsletter_id', $newsletter->id)
@@ -376,7 +375,7 @@ class NewsletterSchedulerTest extends MailPoetTest {
       'monthDay' => null,
       'nthWeekDay' => 'L', // L = last
       'weekDay' => Carbon::SATURDAY,
-      'timeOfDay' => 50400 // 14:00
+      'timeOfDay' => 50400 // 2 p.m.
     );
     Scheduler::processPostNotificationSchedule($newsletter);
     $newsletter_option = NewsletterOption::where('newsletter_id', $newsletter->id)
diff --git a/tests/unit/Router/Endpoints/ViewInBrowserTest.php b/tests/unit/Router/Endpoints/ViewInBrowserTest.php
index 83bb379db8..9d3ab5a4a6 100644
--- a/tests/unit/Router/Endpoints/ViewInBrowserTest.php
+++ b/tests/unit/Router/Endpoints/ViewInBrowserTest.php
@@ -177,7 +177,7 @@ class ViewInBrowserRouterTest extends MailPoetTest {
     expect($result->queue)->false();
   }
 
- function testItProcessesBrowserPreviewData() {
+  function testItProcessesBrowserPreviewData() {
     $processed_data = $this->view_in_browser->_processBrowserPreviewData($this->browser_preview_data);
     expect($processed_data->queue->id)->equals($this->queue->id);
     expect($processed_data->subscriber->id)->equals($this->subscriber->id);
diff --git a/tests/unit/Router/RouterTest.php b/tests/unit/Router/RouterTest.php
index a1a684caeb..737bc85383 100644
--- a/tests/unit/Router/RouterTest.php
+++ b/tests/unit/Router/RouterTest.php
@@ -100,7 +100,7 @@ class FrontRouterTest extends MailPoetTest {
   function testItExecutesUrlParameterConflictResolverAction() {
     $data = array('data' => 'dummy data');
     $result = $this->router->init();
-    expect((boolean) did_action('mailpoet_conflict_resolver_router_url_query_parameters'))->true();
+    expect((boolean)did_action('mailpoet_conflict_resolver_router_url_query_parameters'))->true();
   }
 
   function testItCanEncodeRequestData() {
diff --git a/tests/unit/Subscribers/ImportExport/Export/ExportTest.php b/tests/unit/Subscribers/ImportExport/Export/ExportTest.php
index 49e8b60507..bc31106cd1 100644
--- a/tests/unit/Subscribers/ImportExport/Export/ExportTest.php
+++ b/tests/unit/Subscribers/ImportExport/Export/ExportTest.php
@@ -143,8 +143,7 @@ class ExportTest extends MailPoetTest {
         '|' .
         preg_quote(Env::$temp_url, '|') . '/' .
         basename($this->export->export_file) .
-        '|'
-        , $this->export->export_file_URL)
+        '|', $this->export->export_file_URL)
     )->equals(1);
     expect($this->export->subscriber_batch_size)->notNull();
   }
diff --git a/tests/unit/Subscribers/ImportExport/Import/ImportTest.php b/tests/unit/Subscribers/ImportExport/Import/ImportTest.php
index 2d2c9a7cba..33cc456f3e 100644
--- a/tests/unit/Subscribers/ImportExport/Import/ImportTest.php
+++ b/tests/unit/Subscribers/ImportExport/Import/ImportTest.php
@@ -166,7 +166,7 @@ class ImportTest extends MailPoetTest {
         'email' => 'sTeve.sorrow@exaMple.com'
       ),
     );
-    foreach($subscribers_data_existing as $i=>$existing_subscriber) {
+    foreach($subscribers_data_existing as $i => $existing_subscriber) {
       $subscriber = Subscriber::create();
       $subscriber->hydrate($existing_subscriber);
       $subscriber->save();
@@ -180,7 +180,7 @@ class ImportTest extends MailPoetTest {
     );
     expect($existing_subscribers['email'][0])->equals($subscribers_data['email'][2]);
     expect($existing_subscribers['email'][1])->equals($subscribers_data['email'][3]);
-    foreach($new_subscribers as $field=>$value) {
+    foreach($new_subscribers as $field => $value) {
       expect($value[0])->equals($subscribers_data[$field][0]);
     }
     expect($wp_users)->equals(array($subscribers_data_existing[0]['wp_user_id']));
diff --git a/tests/unit/Subscription/UrlTest.php b/tests/unit/Subscription/UrlTest.php
index af7e0cd67d..e0b7c76ed0 100644
--- a/tests/unit/Subscription/UrlTest.php
+++ b/tests/unit/Subscription/UrlTest.php
@@ -21,7 +21,7 @@ class UrlTest extends MailPoetTest {
     // actual subscriber
     $subscriber = Subscriber::createOrUpdate(array(
       'email' => 'john@mailpoet.com'
-   ));
+    ));
     $url = Url::getConfirmationUrl($subscriber);
     expect($url)->contains('action=confirm');
     expect($url)->contains('endpoint=subscription');
diff --git a/tests/unit/Util/CSSTest.php b/tests/unit/Util/CSSTest.php
index 8c3be85172..b22e133f97 100644
--- a/tests/unit/Util/CSSTest.php
+++ b/tests/unit/Util/CSSTest.php
@@ -1,12 +1,12 @@
-<?php
-
-class CSSTest extends MailPoetTest {
-  public function _before() {
-    $this->css = new \MailPoet\Util\CSS();
-  }
-
-  // tests
-  public function testItCanBeInstantiated() {
-    expect_that($this->css instanceof \MailPoet\Util\CSS);
-  }
-}
+<?php
+
+class CSSTest extends MailPoetTest {
+  public function _before() {
+    $this->css = new \MailPoet\Util\CSS();
+  }
+
+  // tests
+  public function testItCanBeInstantiated() {
+    expect_that($this->css instanceof \MailPoet\Util\CSS);
+  }
+}
diff --git a/tests/unit/Util/XlsxWriterTest.php b/tests/unit/Util/XlsxWriterTest.php
index 85ec095a1f..66c462f70d 100644
--- a/tests/unit/Util/XlsxWriterTest.php
+++ b/tests/unit/Util/XlsxWriterTest.php
@@ -2,13 +2,13 @@
 
 class XlsxWriterTest extends MailPoetTest {
 
-    public function _before() {
-    }
+  public function _before() {
+  }
 
-    public function testItCanBeCreated() {
-      $writer = new \MailPoet\Util\XLSXWriter();
-    }
+  public function testItCanBeCreated() {
+    $writer = new \MailPoet\Util\XLSXWriter();
+  }
 
-    public function _after() {
-    }
+  public function _after() {
+  }
 }
diff --git a/tests/unit/WP/DateTimeTest.php b/tests/unit/WP/DateTimeTest.php
index 11ce366314..b8d202b584 100644
--- a/tests/unit/WP/DateTimeTest.php
+++ b/tests/unit/WP/DateTimeTest.php
@@ -57,7 +57,7 @@ class DateTimeTest extends MailPoetTest {
     $one_hour_interval = array_keys($this->date_time->getTimeInterval(
       '00:00:00',
       '+1 hour',
-      $total_steps=5
+      $total_steps = 5
     ));
     $one_hour_expected = array(
       '00:00:00', '01:00:00', '02:00:00', '03:00:00', '04:00:00');
@@ -66,7 +66,7 @@ class DateTimeTest extends MailPoetTest {
     $quarter_hour_interval = array_keys($this->date_time->getTimeInterval(
       '00:00:00',
       '+15 minute',
-      $total_steps=5
+      $total_steps = 5
     ));
     $quarter_hour_expected = array(
       '00:00:00', '00:15:00', '00:30:00', '00:45:00', '01:00:00',
@@ -76,7 +76,7 @@ class DateTimeTest extends MailPoetTest {
     $offset_start_time_interval = array_keys($this->date_time->getTimeInterval(
       '03:00:00',
       '+1 hour',
-      $total_steps=5
+      $total_steps = 5
     ));
     $offset_start_time_expected = array(
       '03:00:00', '04:00:00', '05:00:00', '06:00:00', '07:00:00',