diff --git a/wp-admin/plugins.php b/wp-admin/plugins.php
index 0f163b2ef6..48530eddce 100644
--- a/wp-admin/plugins.php
+++ b/wp-admin/plugins.php
@@ -93,7 +93,11 @@ if ( !empty($action) ) {
 			if ( is_wp_error($valid) )
 				wp_die($valid);
 
-			error_reporting( E_ALL ^ E_NOTICE );
+			if ( defined('E_RECOVERABLE_ERROR') )
+				error_reporting(E_ERROR | E_WARNING | E_PARSE | E_USER_ERROR | E_USER_WARNING | E_RECOVERABLE_ERROR);
+			else
+				error_reporting(E_ERROR | E_WARNING | E_PARSE | E_USER_ERROR | E_USER_WARNING);
+
 			@ini_set('display_errors', true); //Ensure that Fatal errors are displayed.
 			include(WP_PLUGIN_DIR . '/' . $plugin);
 			do_action('activate_' . $plugin);
diff --git a/wp-admin/update.php b/wp-admin/update.php
index f05de5dffa..304c81f8b9 100644
--- a/wp-admin/update.php
+++ b/wp-admin/update.php
@@ -52,7 +52,12 @@ if ( isset($_GET['action']) ) {
 
 		if( isset($_GET['failure']) ){
 			echo '<p>' . __('Plugin failed to reactivate due to a fatal error.') . '</p>';
-			error_reporting( E_ALL ^ E_NOTICE );
+
+			if ( defined('E_RECOVERABLE_ERROR') )
+				error_reporting(E_ERROR | E_WARNING | E_PARSE | E_USER_ERROR | E_USER_WARNING | E_RECOVERABLE_ERROR);
+			else
+				error_reporting(E_ERROR | E_WARNING | E_PARSE | E_USER_ERROR | E_USER_WARNING);
+
 			@ini_set('display_errors', true); //Ensure that Fatal errors are displayed.
 			include(WP_PLUGIN_DIR . '/' . $plugin);
 		}