diff --git a/lib/classes/Swift/Signers/DKIMSigner.php b/lib/classes/Swift/Signers/DKIMSigner.php
index 6040b2856..b7a620910 100644
--- a/lib/classes/Swift/Signers/DKIMSigner.php
+++ b/lib/classes/Swift/Signers/DKIMSigner.php
@@ -373,7 +373,7 @@ public function setBodySignedLen($len)
             $this->_showLen = true;
             $this->_maxLen = PHP_INT_MAX;
         } elseif ($len === false) {
-            $this->showLen = false;
+            $this->_showLen = false;
             $this->_maxLen = PHP_INT_MAX;
         } else {
             $this->_showLen = true;
diff --git a/lib/classes/Swift/Signers/DomainKeySigner.php b/lib/classes/Swift/Signers/DomainKeySigner.php
index 3f42d3f6e..43210f073 100644
--- a/lib/classes/Swift/Signers/DomainKeySigner.php
+++ b/lib/classes/Swift/Signers/DomainKeySigner.php
@@ -502,7 +502,7 @@ private function _startHash()
                 $this->_hashHandler = hash_init('sha1');
                 break;
         }
-        $this->_canonLine = '';
+        $this->_bodyCanonLine = '';
     }
 
     /**
diff --git a/tests/acceptance/Swift/Mime/ContentEncoder/NativeQpContentEncoderAcceptanceTest.php b/tests/acceptance/Swift/Mime/ContentEncoder/NativeQpContentEncoderAcceptanceTest.php
index e8313da1d..ecd7fcd13 100644
--- a/tests/acceptance/Swift/Mime/ContentEncoder/NativeQpContentEncoderAcceptanceTest.php
+++ b/tests/acceptance/Swift/Mime/ContentEncoder/NativeQpContentEncoderAcceptanceTest.php
@@ -2,6 +2,8 @@
 
 class Swift_Mime_ContentEncoder_NativeQpContentEncoderAcceptanceTest extends \PHPUnit_Framework_TestCase
 {
+    protected $_samplesDir;
+
     /**
      * @var Swift_Mime_ContentEncoder_NativeQpContentEncoder
      */
diff --git a/tests/acceptance/Swift/Transport/StreamBuffer/SocketTimeoutTest.php b/tests/acceptance/Swift/Transport/StreamBuffer/SocketTimeoutTest.php
index c459e139d..3ee7448de 100644
--- a/tests/acceptance/Swift/Transport/StreamBuffer/SocketTimeoutTest.php
+++ b/tests/acceptance/Swift/Transport/StreamBuffer/SocketTimeoutTest.php
@@ -4,6 +4,8 @@ class Swift_Transport_StreamBuffer_SocketTimeoutTest extends \PHPUnit_Framework_
 {
     protected $_buffer;
 
+    protected $_randomHighPort;
+
     protected $_server;
 
     public function setUp()
diff --git a/tests/smoke/Swift/Smoke/AttachmentSmokeTest.php b/tests/smoke/Swift/Smoke/AttachmentSmokeTest.php
index 9e33aff48..d0054d682 100644
--- a/tests/smoke/Swift/Smoke/AttachmentSmokeTest.php
+++ b/tests/smoke/Swift/Smoke/AttachmentSmokeTest.php
@@ -5,6 +5,8 @@
  */
 class Swift_Smoke_AttachmentSmokeTest extends SwiftMailerSmokeTestCase
 {
+    private $_attFile;
+
     public function setUp()
     {
         $this->_attFile = __DIR__.'/../../../_samples/files/textfile.zip';
diff --git a/tests/smoke/Swift/Smoke/HtmlWithAttachmentSmokeTest.php b/tests/smoke/Swift/Smoke/HtmlWithAttachmentSmokeTest.php
index a589752bc..dca14341d 100644
--- a/tests/smoke/Swift/Smoke/HtmlWithAttachmentSmokeTest.php
+++ b/tests/smoke/Swift/Smoke/HtmlWithAttachmentSmokeTest.php
@@ -5,6 +5,8 @@
  */
 class Swift_Smoke_HtmlWithAttachmentSmokeTest extends SwiftMailerSmokeTestCase
 {
+    private $_attFile;
+
     public function setUp()
     {
         $this->_attFile = __DIR__.'/../../../_samples/files/textfile.zip';
diff --git a/tests/smoke/Swift/Smoke/InternationalSmokeTest.php b/tests/smoke/Swift/Smoke/InternationalSmokeTest.php
index e7c695e42..66e37ec64 100644
--- a/tests/smoke/Swift/Smoke/InternationalSmokeTest.php
+++ b/tests/smoke/Swift/Smoke/InternationalSmokeTest.php
@@ -5,6 +5,8 @@
  */
 class Swift_Smoke_InternationalSmokeTest extends SwiftMailerSmokeTestCase
 {
+    private $_attFile;
+
     public function setUp()
     {
         $this->_attFile = __DIR__.'/../../../_samples/files/textfile.zip';
diff --git a/tests/unit/Swift/Plugins/BandwidthMonitorPluginTest.php b/tests/unit/Swift/Plugins/BandwidthMonitorPluginTest.php
index f14099316..49024cff7 100644
--- a/tests/unit/Swift/Plugins/BandwidthMonitorPluginTest.php
+++ b/tests/unit/Swift/Plugins/BandwidthMonitorPluginTest.php
@@ -2,6 +2,10 @@
 
 class Swift_Plugins_BandwidthMonitorPluginTest extends \PHPUnit_Framework_TestCase
 {
+    private $_monitor;
+
+    private $_bytes = 0;
+
     public function setUp()
     {
         $this->_monitor = new Swift_Plugins_BandwidthMonitorPlugin();
@@ -117,7 +121,6 @@ private function _createMessageWithByteCount($bytes)
         return $msg;
     }
 
-    private $_bytes = 0;
     public function _write($is)
     {
         for ($i = 0; $i < $this->_bytes; ++$i) {