diff --git a/docs/_includes/matrix.html b/docs/_includes/matrix.html
index 553a531ec..ca30b946a 100644
--- a/docs/_includes/matrix.html
+++ b/docs/_includes/matrix.html
@@ -546,7 +546,9 @@
 		<td><i class="fa fa-minus dim"></i></td>
 		<td><i class="fa fa-minus dim"></i></td>
 		<td><i class="fa fa-minus dim"></i></td>
-		<td><i class="fa fa-minus dim"></i></td>
+		<td class="success">
+			<i class="fa fa-check text-success" aria-hidden="true"></i>
+		</td>
 		<td><i class="fa fa-minus dim"></i></td>
 		<td><i class="fa fa-minus dim"></i></td>
 		<td><i class="fa fa-minus dim"></i></td>
@@ -1350,7 +1352,9 @@
 		<td><i class="fa fa-minus dim"></i></td>
 		<td><i class="fa fa-minus dim"></i></td>
 		<td><i class="fa fa-minus dim"></i></td>
-		<td><i class="fa fa-minus dim"></i></td>
+		<td class="success">
+			<i class="fa fa-check text-success" aria-hidden="true"></i>
+		</td>
 		<td><i class="fa fa-minus dim"></i></td>
 		<td><i class="fa fa-minus dim"></i></td>
 		<td class="danger">
diff --git a/integrationTest/integration_test.go b/integrationTest/integration_test.go
index 3ee6bd05b..0947f8418 100644
--- a/integrationTest/integration_test.go
+++ b/integrationTest/integration_test.go
@@ -1073,19 +1073,27 @@ func makeTests(t *testing.T) []*TestGroup {
 			tc("CAA record", caa("@", "issue", 0, "letsencrypt.org")),
 			tc("CAA change tag", caa("@", "issuewild", 0, "letsencrypt.org")),
 			tc("CAA change target", caa("@", "issuewild", 0, "example.com")),
-			tc("CAA change flag", caa("@", "issuewild", 128, "example.com")),
 			tc("CAA many records",
 				caa("@", "issue", 0, "letsencrypt.org"),
 				caa("@", "issuewild", 0, "comodoca.com"),
-				caa("@", "iodef", 128, "mailto:test@example.com")),
+				caa("@", "iodef", 0, "mailto:test@example.com")),
 			tc("CAA delete", caa("@", "issue", 0, "letsencrypt.org")),
 		),
+		testgroup("CAA noflag",
+			requires(providers.CanUseCAA), not("LINODE"),
+			// LINODE can only set the flag to "0".
+			// https://www.linode.com/community/questions/20714/how-to-i-change-the-flag-in-a-caa-record
+			// Consolidate any tests with a non-zero flag to this testgroup
+			// so they can be easily skipped.
+			tc("CAA flag0", caa("@", "issuewild", 0, "example.com")),
+			tc("CAA change flag", caa("@", "issuewild", 128, "example.com")),
+		),
 		testgroup("CAA with ;",
 			requires(providers.CanUseCAA), not("DIGITALOCEAN"),
 			// Test support of ";" as a value
 			tc("CAA many records", caa("@", "issuewild", 0, ";")),
 		),
-		testgroup("Issue 1374",
+		testgroup("CAA Issue 1374",
 			requires(providers.CanUseCAA), not("DIGITALOCEAN"),
 			// Test support of spaces in the 3rd field.
 			tc("CAA spaces", caa("@", "issue", 0, "letsencrypt.org; validationmethods=dns-01; accounturi=https://acme-v02.api.letsencrypt.org/acme/acct/1234")),