diff --git a/build/uk_master_test.xsl b/build/uk_master_test.xsl
index 77220704..88097701 100644
--- a/build/uk_master_test.xsl
+++ b/build/uk_master_test.xsl
@@ -195,9 +195,25 @@
 	<xsl:template match="md:ContactPerson[@contactType='administrative']">
 		<!-- do nothing -->
 	</xsl:template>
-	
-	<!--By default, copy text blocks, comments and attributes unchanged.-->
-	<xsl:template match="text()|comment()|@*">
+	
+	<!--
+		Retain only certain comments.
+	-->
+	
+	<xsl:template match="md:EntityDescriptor/comment()">
+		<xsl:copy/>
+	</xsl:template>
+	
+	<xsl:template match="shibmd:KeyAuthority//comment()">
+		<xsl:copy/>
+	</xsl:template>
+	
+	<!--
+		Strip all other comments.
+	-->
+	
+	<!--By default, copy text blocks and attributes unchanged.-->
+	<xsl:template match="text()|@*">
 		<xsl:copy/>
 	</xsl:template>