diff --git a/__tests__/project/default/nunit/testProject/testProject.csproj b/__tests__/project/default/nunit/testProject/testProject.csproj
index dcc01163..aad77055 100644
--- a/__tests__/project/default/nunit/testProject/testProject.csproj
+++ b/__tests__/project/default/nunit/testProject/testProject.csproj
@@ -3,6 +3,7 @@
     <PropertyGroup>
         <TargetFrameworks>netcoreapp2.0</TargetFrameworks>
         <TargetFrameworks Condition="'$(OS)'!='Unix'">$(TargetFrameworks);net461</TargetFrameworks>
+        <NoWarn>$(NoWarn);CS1591;SA1600</NoWarn>
 
         <IsPackable>false</IsPackable>
     </PropertyGroup>
diff --git a/__tests__/project/default/xunit/testProject/testProject.csproj b/__tests__/project/default/xunit/testProject/testProject.csproj
index 1fe3e117..8bbe2707 100644
--- a/__tests__/project/default/xunit/testProject/testProject.csproj
+++ b/__tests__/project/default/xunit/testProject/testProject.csproj
@@ -3,6 +3,7 @@
     <PropertyGroup>
         <TargetFrameworks>netcoreapp2.1</TargetFrameworks>
         <TargetFrameworks Condition="'$(OS)'!='Unix'">$(TargetFrameworks);net461</TargetFrameworks>
+        <NoWarn>$(NoWarn);CS1591;SA1600</NoWarn>
 
         <IsPackable>false</IsPackable>
     </PropertyGroup>
diff --git a/__tests__/project/space/testProject.csproj b/__tests__/project/space/testProject.csproj
index ede56224..d72177f3 100644
--- a/__tests__/project/space/testProject.csproj
+++ b/__tests__/project/space/testProject.csproj
@@ -3,6 +3,7 @@
   <PropertyGroup>
     <TargetFrameworks>netcoreapp2.1</TargetFrameworks>
     <TargetFrameworks Condition="'$(OS)'!='Unix'">$(TargetFrameworks);net461</TargetFrameworks>
+    <NoWarn>$(NoWarn);CS1591;SA1600</NoWarn>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
diff --git a/src/project/templates/Cake.Template.Tests/Cake.Template.Tests.csproj.tmpl b/src/project/templates/Cake.Template.Tests/Cake.Template.Tests.csproj.tmpl
index 0bce20f9..1b4f29e7 100644
--- a/src/project/templates/Cake.Template.Tests/Cake.Template.Tests.csproj.tmpl
+++ b/src/project/templates/Cake.Template.Tests/Cake.Template.Tests.csproj.tmpl
@@ -1,11 +1,15 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<%
+	let warnings = "$(NoWarn);CS1591;SA1600";
+	if (licenseType === "Unlicense" || licenseType === "WTFPL") {
+		warnings += ";SA1633";
+	}
+%><Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
 		<TargetFrameworks>netcoreapp2.1</TargetFrameworks>
 		<TargetFrameworks Condition="'$(OS)'!='Unix'">$(TargetFrameworks);net461</TargetFrameworks>
-<% if (licenseType === "Unlicense" || licenseType === "WTFPL") { -%>
-		<NoWarn>$(NoWarn);SA1633</NoWarn>
-<% } %>
+		<NoWarn><%= warnings %></NoWarn>
+
 		<IsPackable>false</IsPackable>
 	</PropertyGroup>