diff --git a/lib/Cake/Network/Email/CakeEmail.php b/lib/Cake/Network/Email/CakeEmail.php
index fb821e164..7f6257da5 100644
--- a/lib/Cake/Network/Email/CakeEmail.php
+++ b/lib/Cake/Network/Email/CakeEmail.php
@@ -139,7 +139,7 @@ class CakeEmail {
  * @var mixed True to generate, False to ignore, String with value
  */
 	protected $_messageId = true;
-	
+
 /**
  * Domain for messageId generation.
  * Needs to be manually set for CLI mailing as env('HTTP_HOST') is empty
@@ -320,7 +320,7 @@ class CakeEmail {
 		if (empty($this->_domain)) {
 			$this->_domain = php_uname('n');
 		}
-		
+
 		if ($config) {
 			$this->config($config);
 		}
@@ -913,7 +913,7 @@ class CakeEmail {
 		$this->_domain = $domain;
 		return $this;
 	}
-	
+
 /**
  * Add attachments to the email message
  *
diff --git a/lib/Cake/Test/Case/Console/ShellTest.php b/lib/Cake/Test/Case/Console/ShellTest.php
index e9b7abe61..4a0bf1b58 100644
--- a/lib/Cake/Test/Case/Console/ShellTest.php
+++ b/lib/Cake/Test/Case/Console/ShellTest.php
@@ -597,10 +597,10 @@ class ShellTest extends CakeTestCase {
  */
 	public function testCreateFileNoPermissions() {
 		$this->skipIf(DIRECTORY_SEPARATOR === '\\', 'Cant perform operations using permissions on windows.');
-		
+
 		$path = TMP . 'shell_test';
 		$file = $path . DS . 'no_perms';
-		
+
 		if (!is_dir($path)) {
 			mkdir($path);
 		}
diff --git a/lib/Cake/Test/Case/Model/ModelWriteTest.php b/lib/Cake/Test/Case/Model/ModelWriteTest.php
index c63230e89..984e5649d 100644
--- a/lib/Cake/Test/Case/Model/ModelWriteTest.php
+++ b/lib/Cake/Test/Case/Model/ModelWriteTest.php
@@ -5258,7 +5258,6 @@ class ModelWriteTest extends BaseModelTest {
 
 		$result = $TestModel->saveAssociated(array('Article' => array()), array('validate' => true, 'atomic' => false));
 		$this->assertEquals(array('Article' => false), $result);
-
 	}
 
 /**
diff --git a/lib/Cake/Test/Case/Network/Email/CakeEmailTest.php b/lib/Cake/Test/Case/Network/Email/CakeEmailTest.php
index 45c668688..6a21032ba 100644
--- a/lib/Cake/Test/Case/Network/Email/CakeEmailTest.php
+++ b/lib/Cake/Test/Case/Network/Email/CakeEmailTest.php
@@ -397,7 +397,7 @@ class CakeEmailTest extends CakeTestCase {
 		$result = $this->CakeEmail->domain();
 		$expected = env('HTTP_HOST') ? env('HTTP_HOST') : php_uname('n');
 		$this->assertSame($expected, $result);
-		
+
 		$this->CakeEmail->domain('example.org');
 		$result = $this->CakeEmail->domain();
 		$expected = 'example.org';
@@ -408,12 +408,12 @@ class CakeEmailTest extends CakeTestCase {
  * testMessageIdWithDomain method
  *
  * @return void
- */	
+ */
 	public function testMessageIdWithDomain() {
 		$result = $this->CakeEmail->getHeaders();
 		$expected = '@' . (env('HTTP_HOST') ? env('HTTP_HOST') : php_uname('n')) . '>';
 		$this->assertTextContains($expected, $result['Message-ID']);
-		
+
 		$this->CakeEmail->domain('example.org');
 		$result = $this->CakeEmail->getHeaders();
 		$expected = '@example.org>';
diff --git a/lib/Cake/Test/Case/View/Helper/FormHelperTest.php b/lib/Cake/Test/Case/View/Helper/FormHelperTest.php
index d798b2602..aa7f40093 100644
--- a/lib/Cake/Test/Case/View/Helper/FormHelperTest.php
+++ b/lib/Cake/Test/Case/View/Helper/FormHelperTest.php
@@ -3551,7 +3551,6 @@ class FormHelperTest extends CakeTestCase {
 		$this->assertTags($result, $expected);
 	}
 
-
 /**
  * test adding an empty option for radio buttons
  *
@@ -3607,7 +3606,7 @@ class FormHelperTest extends CakeTestCase {
 			'/div'
 		);
 		$this->assertTags($result, $expected);
-		
+
 		$result = $this->Form->input('Model.1.field', array(
 			'type' => 'radio',
 			'options' => array('option A'),