diff --git a/.travis.yml b/.travis.yml
index c828d01..c867adf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,6 +7,7 @@ notifications:
 php:
   - 5.3
   - 5.5
+  - 5.6
 
 env:
   - WP_VERSION=latest WP_MULTISITE=0
diff --git a/lib/VCCW_MailCatcher.php b/lib/VCCW_MailCatcher.php
index 12d9197..02049db 100644
--- a/lib/VCCW_MailCatcher.php
+++ b/lib/VCCW_MailCatcher.php
@@ -20,6 +20,10 @@ class VCCW_MailCatcher
 	 */
 	public function __construct( array $config = array() )
 	{
+		if ( ! defined( 'WP_DEBUG' ) || ! WP_DEBUG ) {
+			return;
+		}
+
 		// Setup our defaults
 		$defaults = array(
 			"host"     => "127.0.0.1",