diff --git a/server_status_advisor.php b/server_status_advisor.php
index 29d5f5c390..292c37d288 100644
--- a/server_status_advisor.php
+++ b/server_status_advisor.php
@@ -23,52 +23,69 @@ $response = PMA_Response::getInstance();
 $scripts = $response->getHeader()->getScripts();
 $scripts->addFile('server_status_advisor.js');
 
-$output  = '<div>';
-$output .= $ServerStatusData->getMenuHtml();
-$output .= '<a href="#openAdvisorInstructions">';
-$output .= PMA_Util::getIcon('b_help.png', __('Instructions'));
-$output .= '</a>';
-$output .= '<div id="statustabs_advisor"></div>';
-$output .= '<div id="advisorInstructionsDialog" style="display:none;">';
-$output .= '<p>';
-$output .= __(
-    'The Advisor system can provide recommendations '
-    . 'on server variables by analyzing the server status variables.'
-);
-$output .= '</p>';
-$output .= '<p>';
-$output .= __(
-    'Do note however that this system provides recommendations '
-    . 'based on simple calculations and by rule of thumb which may '
-    . 'not necessarily apply to your system.'
-);
-$output .= '</p>';
-$output .= '<p>';
-$output .= __(
-    'Prior to changing any of the configuration, be sure to know '
-    . 'what you are changing (by reading the documentation) and how '
-    . 'to undo the change. Wrong tuning can have a very negative '
-    . 'effect on performance.'
-);
-$output .= '</p>';
-$output .= '<p>';
-$output .= __(
-    'The best way to tune your system would be to change only one '
-    . 'setting at a time, observe or benchmark your database, and undo '
-    . 'the change if there was no clearly measurable improvement.'
-);
-$output .= '</p>';
-$output .= '</div>';
-$output .= '<div id="advisorData" style="display:none;">';
-$advisor = new Advisor();
-$output .= htmlspecialchars(
-    json_encode(
-        $advisor->run()
-    )
-);
-$output .= '</div>';
-$output .= '</div>';
+/**
+ * Output
+ */
+$response->addHTML('<div>');
+$response->addHTML($ServerStatusData->getMenuHtml());
+$response->addHTML(getPrintAdvisorHtml($ServerStatusData));
+$response->addHTML('</div>');
+exit;
 
-$response->addHTML($output);
+
+/**
+ * Prints html with Advisor
+ *
+ * @param null
+ *
+ * @return string
+ */
+function getPrintAdvisorHtml()
+{
+	$output  = '<a href="#openAdvisorInstructions">';
+	$output .= PMA_Util::getIcon('b_help.png', __('Instructions'));
+	$output .= '</a>';
+	$output .= '<div id="statustabs_advisor"></div>';
+	$output .= '<div id="advisorInstructionsDialog" style="display:none;">';
+	$output .= '<p>';
+	$output .= __(
+	    'The Advisor system can provide recommendations '
+	    . 'on server variables by analyzing the server status variables.'
+	);
+	$output .= '</p>';
+	$output .= '<p>';
+	$output .= __(
+	    'Do note however that this system provides recommendations '
+	    . 'based on simple calculations and by rule of thumb which may '
+	    . 'not necessarily apply to your system.'
+	);
+	$output .= '</p>';
+	$output .= '<p>';
+	$output .= __(
+	    'Prior to changing any of the configuration, be sure to know '
+	    . 'what you are changing (by reading the documentation) and how '
+	    . 'to undo the change. Wrong tuning can have a very negative '
+	    . 'effect on performance.'
+	);
+	$output .= '</p>';
+	$output .= '<p>';
+	$output .= __(
+	    'The best way to tune your system would be to change only one '
+	    . 'setting at a time, observe or benchmark your database, and undo '
+	    . 'the change if there was no clearly measurable improvement.'
+	);
+	$output .= '</p>';
+	$output .= '</div>';
+	$output .= '<div id="advisorData" style="display:none;">';
+	$advisor = new Advisor();
+	$output .= htmlspecialchars(
+	    json_encode(
+	        $advisor->run()
+	    )
+	);
+	$output .= '</div>';
+ 
+	return $output;
+}
 
 ?>