diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/tester/RestfulTesterServlet.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/tester/RestfulTesterServlet.java
index 655c69e119f..bf68879ff17 100644
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/tester/RestfulTesterServlet.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/tester/RestfulTesterServlet.java
@@ -493,7 +493,9 @@ public class RestfulTesterServlet extends HttpServlet {
 			requestBody = StringEscapeUtils.escapeHtml4(requestBody);
 			theContext.setVariable("requestBody", requestBody);
 			theContext.setVariable("requestSyntaxHighlighterClass", requestSyntaxHighlighterClass);
-			theContext.setVariable("resultBody", StringEscapeUtils.escapeHtml4(resultBody));
+			String resultBodyText = StringEscapeUtils.escapeHtml4(resultBody);
+			theContext.setVariable("resultBody", resultBodyText);
+			theContext.setVariable("resultBodyIsLong", resultBodyText.length() > 1000);
 			theContext.setVariable("resultSyntaxHighlighterClass", resultSyntaxHighlighterClass);
 			theContext.setVariable("requestHeaders", requestHeaders);
 			theContext.setVariable("responseHeaders", responseHeaders);
diff --git a/hapi-fhir-base/src/main/resources/ca/uhn/fhir/rest/server/tester/RestfulTester.html b/hapi-fhir-base/src/main/resources/ca/uhn/fhir/rest/server/tester/RestfulTester.html
index 37d880c4ef1..3ad497bcde2 100644
--- a/hapi-fhir-base/src/main/resources/ca/uhn/fhir/rest/server/tester/RestfulTester.html
+++ b/hapi-fhir-base/src/main/resources/ca/uhn/fhir/rest/server/tester/RestfulTester.html
@@ -927,13 +927,25 @@
 									<td rowspan="2">Result Body</td>
 									<td>
 										<span th:text="${resultDescription}"/>
+										<button th:if="${resultBodyIsLong}" class="btn btn-info btn-sm" type="button" id="format-result-btn">
+											<span class="glyphicon glyphicon-eye-open"></span>
+											Colour
+										</button>
+										<script type="text/javascript" th:if="${resultBodyIsLong}">
+											$('#format-result-btn').click(function() {
+												//$('#resultBodyActualPre').setClass('<th:block th:text="${resultSyntaxHighlighterClass}"/>');
+												document.getElementById('resultBodyActualPre').className='<th:block th:text="${resultSyntaxHighlighterClass}"/>';
+												document.getElementById('format-result-btn').disabled ='disabled';
+												SyntaxHighlighter.highlight();
+											});
+										</script>
 									</td>
 								</tr>
 								<tr th:if="${!#strings.isEmpty(resultBody)}">
 									<td valign="top" style="margin: 0px; padding: 0px;">
 										<pre class="resultBodyPre resultBodyPlaceholder" id="resultBodyPlaceholder">...loading...</pre>
-										<div id="resultBodyActual" class="resultBodyActual">
-											<pre th:text="${resultBody}" th:class="${resultSyntaxHighlighterClass} + ' resultBodyPre pre-scrollable'" style="display: none;">{}</pre>
+										<div id="resultBodyActual" class="resultBodyActual" style="display: none;">
+											<pre id="resultBodyActualPre" th:text="${resultBody}" th:class="(${resultBodyIsLong} ? '' : ${resultSyntaxHighlighterClass}) + ' resultBodyPre pre-scrollable'">{}</pre>
 										</div>
 									</td>
 								</tr>
diff --git a/hapi-fhir-base/src/main/resources/ca/uhn/fhir/rest/server/tester/css/tester.css b/hapi-fhir-base/src/main/resources/ca/uhn/fhir/rest/server/tester/css/tester.css
index 56106d0b1dd..c13b2f5e5fd 100644
--- a/hapi-fhir-base/src/main/resources/ca/uhn/fhir/rest/server/tester/css/tester.css
+++ b/hapi-fhir-base/src/main/resources/ca/uhn/fhir/rest/server/tester/css/tester.css
@@ -91,6 +91,7 @@ PRE.resultBodyPre {
 	line-height: 0.9em;
 	font-size: 0.8em;
 	border: none;
+	background-color: transparent;
 }
 
 /*