--- a/hgext/reviewboard/tests/test-bugzilla-review-flag-cleared.t
+++ b/hgext/reviewboard/tests/test-bugzilla-review-flag-cleared.t
@@ -52,17 +52,18 @@ Sanity check to ensure we have a review 
     - reviewer@example.com
     comments:
     - author: author@example.com
       id: 1
       tags: []
       text: ''
     - author: author@example.com
       id: 2
-      tags: []
+      tags:
+      - mozreview-request
       text:
       - Created attachment 1
       - Bug 1 - Initial commit to review
       - ''
       - 'Review commit: http://$DOCKER_HOSTNAME:$HGPORT1/r/2/diff/#index_header'
       - 'See other reviews: http://$DOCKER_HOSTNAME:$HGPORT1/r/2/'
     component: TestComponent
     depends_on: []
@@ -101,17 +102,18 @@ Publishing a non-'clear-the-flag' review
     - reviewer@example.com
     comments:
     - author: author@example.com
       id: 1
       tags: []
       text: ''
     - author: author@example.com
       id: 2
-      tags: []
+      tags:
+      - mozreview-request
       text:
       - Created attachment 1
       - Bug 1 - Initial commit to review
       - ''
       - 'Review commit: http://$DOCKER_HOSTNAME:$HGPORT1/r/2/diff/#index_header'
       - 'See other reviews: http://$DOCKER_HOSTNAME:$HGPORT1/r/2/'
     - author: reviewer@example.com
       id: 3
@@ -156,17 +158,18 @@ Posting an r? review with a comment only
     - reviewer@example.com
     comments:
     - author: author@example.com
       id: 1
       tags: []
       text: ''
     - author: author@example.com
       id: 2
-      tags: []
+      tags:
+      - mozreview-request
       text:
       - Created attachment 1
       - Bug 1 - Initial commit to review
       - ''
       - 'Review commit: http://$DOCKER_HOSTNAME:$HGPORT1/r/2/diff/#index_header'
       - 'See other reviews: http://$DOCKER_HOSTNAME:$HGPORT1/r/2/'
     - author: reviewer@example.com
       id: 3
@@ -218,17 +221,18 @@ Posting a r+ review will add a '+' revie
     - reviewer@example.com
     comments:
     - author: author@example.com
       id: 1
       tags: []
       text: ''
     - author: author@example.com
       id: 2
-      tags: []
+      tags:
+      - mozreview-request
       text:
       - Created attachment 1
       - Bug 1 - Initial commit to review
       - ''
       - 'Review commit: http://$DOCKER_HOSTNAME:$HGPORT1/r/2/diff/#index_header'
       - 'See other reviews: http://$DOCKER_HOSTNAME:$HGPORT1/r/2/'
     - author: reviewer@example.com
       id: 3
@@ -293,17 +297,18 @@ Updating the review request as an L1 aut
     - reviewer@example.com
     comments:
     - author: author@example.com
       id: 1
       tags: []
       text: ''
     - author: author@example.com
       id: 2
-      tags: []
+      tags:
+      - mozreview-request
       text:
       - Created attachment 1
       - Bug 1 - Initial commit to review
       - ''
       - 'Review commit: http://$DOCKER_HOSTNAME:$HGPORT1/r/2/diff/#index_header'
       - 'See other reviews: http://$DOCKER_HOSTNAME:$HGPORT1/r/2/'
     - author: reviewer@example.com
       id: 3
@@ -326,17 +331,18 @@ Updating the review request as an L1 aut
       - Comment on attachment 1
       - Bug 1 - Initial commit to review
       - ''
       - http://$DOCKER_HOSTNAME:$HGPORT1/r/2/#review3
       - ''
       - LGTM
     - author: author@example.com
       id: 6
-      tags: []
+      tags:
+      - mozreview-request
       text:
       - Comment on attachment 1
       - Bug 1 - Initial commit to review
       - ''
       - 'Review request updated; see interdiff: http://$DOCKER_HOSTNAME:$HGPORT1/r/2/diff/1-2/'
     component: TestComponent
     depends_on: []
     platform: All
@@ -389,17 +395,18 @@ Sanity check to ensure we have an r? fla
     - reviewer@example.com
     comments:
     - author: l3author@example.com
       id: 7
       tags: []
       text: ''
     - author: l3author@example.com
       id: 8
-      tags: []
+      tags:
+      - mozreview-request
       text:
       - Created attachment 2
       - Bug 2 - Initial commit to review
       - ''
       - 'Review commit: http://$DOCKER_HOSTNAME:$HGPORT1/r/4/diff/#index_header'
       - 'See other reviews: http://$DOCKER_HOSTNAME:$HGPORT1/r/4/'
     component: TestComponent
     depends_on: []
@@ -440,17 +447,18 @@ Sanity check to ensure we have an r+ fla
     - reviewer@example.com
     comments:
     - author: l3author@example.com
       id: 7
       tags: []
       text: ''
     - author: l3author@example.com
       id: 8
-      tags: []
+      tags:
+      - mozreview-request
       text:
       - Created attachment 2
       - Bug 2 - Initial commit to review
       - ''
       - 'Review commit: http://$DOCKER_HOSTNAME:$HGPORT1/r/4/diff/#index_header'
       - 'See other reviews: http://$DOCKER_HOSTNAME:$HGPORT1/r/4/'
     - author: reviewer@example.com
       id: 9
@@ -505,17 +513,18 @@ We should have an r+ flag already set.
     - reviewer@example.com
     comments:
     - author: l3author@example.com
       id: 7
       tags: []
       text: ''
     - author: l3author@example.com
       id: 8
-      tags: []
+      tags:
+      - mozreview-request
       text:
       - Created attachment 2
       - Bug 2 - Modified commit to review
       - ''
       - 'Review commit: http://$DOCKER_HOSTNAME:$HGPORT1/r/4/diff/#index_header'
       - 'See other reviews: http://$DOCKER_HOSTNAME:$HGPORT1/r/4/'
     - author: reviewer@example.com
       id: 9
@@ -524,17 +533,18 @@ We should have an r+ flag already set.
       - Comment on attachment 2
       - Bug 2 - Modified commit to review
       - ''
       - http://$DOCKER_HOSTNAME:$HGPORT1/r/4/#review4
       - ''
       - LGTM
     - author: l3author@example.com
       id: 10
-      tags: []
+      tags:
+      - mozreview-request
       text:
       - Comment on attachment 2
       - Bug 2 - Modified commit to review
       - ''
       - 'Review request updated; see interdiff: http://$DOCKER_HOSTNAME:$HGPORT1/r/4/diff/1-2/'
     component: TestComponent
     depends_on: []
     platform: All
@@ -575,17 +585,18 @@ Posting a r- review will add a '-' revie
     - reviewer@example.com
     comments:
     - author: l3author@example.com
       id: 7
       tags: []
       text: ''
     - author: l3author@example.com
       id: 8
-      tags: []
+      tags:
+      - mozreview-request
       text:
       - Created attachment 2
       - Bug 2 - Modified commit to review
       - ''
       - 'Review commit: http://$DOCKER_HOSTNAME:$HGPORT1/r/4/diff/#index_header'
       - 'See other reviews: http://$DOCKER_HOSTNAME:$HGPORT1/r/4/'
     - author: reviewer@example.com
       id: 9
@@ -594,17 +605,18 @@ Posting a r- review will add a '-' revie
       - Comment on attachment 2
       - Bug 2 - Modified commit to review
       - ''
       - http://$DOCKER_HOSTNAME:$HGPORT1/r/4/#review4
       - ''
       - LGTM
     - author: l3author@example.com
       id: 10
-      tags: []
+      tags:
+      - mozreview-request
       text:
       - Comment on attachment 2
       - Bug 2 - Modified commit to review
       - ''
       - 'Review request updated; see interdiff: http://$DOCKER_HOSTNAME:$HGPORT1/r/4/diff/1-2/'
     - author: l3author@example.com
       id: 11
       tags: []
@@ -675,17 +687,18 @@ Adding a reviewer should leave r- untouc
     - reviewer@example.com
     comments:
     - author: author@example.com
       id: 12
       tags: []
       text: ''
     - author: author@example.com
       id: 13
-      tags: []
+      tags:
+      - mozreview-request
       text:
       - Created attachment 3
       - Bug 3 - Initial commit to review
       - ''
       - 'Review commit: http://$DOCKER_HOSTNAME:$HGPORT1/r/6/diff/#index_header'
       - 'See other reviews: http://$DOCKER_HOSTNAME:$HGPORT1/r/6/'
     - author: reviewer@example.com
       id: 14
@@ -740,17 +753,18 @@ Publishing a new revision should reset r
     - reviewer@example.com
     comments:
     - author: author@example.com
       id: 12
       tags: []
       text: ''
     - author: author@example.com
       id: 13
-      tags: []
+      tags:
+      - mozreview-request
       text:
       - Created attachment 3
       - Bug 3 - Modified commit to review
       - ''
       - 'Review commit: http://$DOCKER_HOSTNAME:$HGPORT1/r/6/diff/#index_header'
       - 'See other reviews: http://$DOCKER_HOSTNAME:$HGPORT1/r/6/'
     - author: reviewer@example.com
       id: 14
@@ -759,17 +773,18 @@ Publishing a new revision should reset r
       - Comment on attachment 3
       - Bug 3 - Modified commit to review
       - ''
       - http://$DOCKER_HOSTNAME:$HGPORT1/r/6/#review6
       - ''
       - This is all wrong
     - author: author@example.com
       id: 15
-      tags: []
+      tags:
+      - mozreview-request
       text:
       - Comment on attachment 3
       - Bug 3 - Modified commit to review
       - ''
       - 'Review request updated; see interdiff: http://$DOCKER_HOSTNAME:$HGPORT1/r/6/diff/1-2/'
     component: TestComponent
     depends_on: []
     platform: All

--- a/hgext/reviewboard/tests/test-bugzilla-review-interaction.t
+++ b/hgext/reviewboard/tests/test-bugzilla-review-interaction.t
@@ -58,17 +58,18 @@ Adding a reviewer should result in a r? 
     - reviewer@example.com
     comments:
     - author: author@example.com
       id: 1
       tags: []
       text: ''
     - author: author@example.com
       id: 2
-      tags: []
+      tags:
+      - mozreview-request
       text:
       - Created attachment 1
       - Bug 1 - Initial commit to review
       - ''
       - 'Review commit: http://$DOCKER_HOSTNAME:$HGPORT1/r/2/diff/#index_header'
       - 'See other reviews: http://$DOCKER_HOSTNAME:$HGPORT1/r/2/'
     component: TestComponent
     depends_on: []
@@ -107,17 +108,18 @@ Adding a r+ review will grant a '+' revi
     - reviewer@example.com
     comments:
     - author: author@example.com
       id: 1
       tags: []
       text: ''
     - author: author@example.com
       id: 2
-      tags: []
+      tags:
+      - mozreview-request
       text:
       - Created attachment 1
       - Bug 1 - Initial commit to review
       - ''
       - 'Review commit: http://$DOCKER_HOSTNAME:$HGPORT1/r/2/diff/#index_header'
       - 'See other reviews: http://$DOCKER_HOSTNAME:$HGPORT1/r/2/'
     - author: reviewer@example.com
       id: 3
@@ -166,17 +168,18 @@ Adding a reply to the review will add a 
     - reviewer@example.com
     comments:
     - author: author@example.com
       id: 1
       tags: []
       text: ''
     - author: author@example.com
       id: 2
-      tags: []
+      tags:
+      - mozreview-request
       text:
       - Created attachment 1
       - Bug 1 - Initial commit to review
       - ''
       - 'Review commit: http://$DOCKER_HOSTNAME:$HGPORT1/r/2/diff/#index_header'
       - 'See other reviews: http://$DOCKER_HOSTNAME:$HGPORT1/r/2/'
     - author: reviewer@example.com
       id: 3
@@ -253,17 +256,18 @@ in the tests.
     - reviewer@example.com
     comments:
     - author: author@example.com
       id: 5
       tags: []
       text: ''
     - author: author@example.com
       id: 6
-      tags: []
+      tags:
+      - mozreview-request
       text:
       - Created attachment 2
       - Bug 2 - Multiple reviewers
       - ''
       - 'Review commit: http://$DOCKER_HOSTNAME:$HGPORT1/r/4/diff/#index_header'
       - 'See other reviews: http://$DOCKER_HOSTNAME:$HGPORT1/r/4/'
     component: TestComponent
     depends_on: []
@@ -306,17 +310,18 @@ Removing a reviewer should remove their 
     - reviewer@example.com
     comments:
     - author: author@example.com
       id: 5
       tags: []
       text: ''
     - author: author@example.com
       id: 6
-      tags: []
+      tags:
+      - mozreview-request
       text:
       - Created attachment 2
       - Bug 2 - Multiple reviewers
       - ''
       - 'Review commit: http://$DOCKER_HOSTNAME:$HGPORT1/r/4/diff/#index_header'
       - 'See other reviews: http://$DOCKER_HOSTNAME:$HGPORT1/r/4/'
     component: TestComponent
     depends_on: []
@@ -354,17 +359,18 @@ Removing all reviewers should remove all
     - reviewer@example.com
     comments:
     - author: author@example.com
       id: 5
       tags: []
       text: ''
     - author: author@example.com
       id: 6
-      tags: []
+      tags:
+      - mozreview-request
       text:
       - Created attachment 2
       - Bug 2 - Multiple reviewers
       - ''
       - 'Review commit: http://$DOCKER_HOSTNAME:$HGPORT1/r/4/diff/#index_header'
       - 'See other reviews: http://$DOCKER_HOSTNAME:$HGPORT1/r/4/'
     component: TestComponent
     depends_on: []
@@ -424,17 +430,18 @@ review? sticks around when 1 person gran
     - reviewer@example.com
     comments:
     - author: author@example.com
       id: 7
       tags: []
       text: ''
     - author: author@example.com
       id: 8
-      tags: []
+      tags:
+      - mozreview-request
       text:
       - Created attachment 3
       - Bug 3 - More multiple reviewers
       - ''
       - 'Review commit: http://$DOCKER_HOSTNAME:$HGPORT1/r/6/diff/#index_header'
       - 'See other reviews: http://$DOCKER_HOSTNAME:$HGPORT1/r/6/'
     - author: reviewer@example.com
       id: 9
@@ -503,17 +510,18 @@ Random users can come along and grant re
     - reviewer@example.com
     comments:
     - author: author@example.com
       id: 10
       tags: []
       text: ''
     - author: author@example.com
       id: 11
-      tags: []
+      tags:
+      - mozreview-request
       text:
       - Created attachment 4
       - Bug 4 - Unrelated Reviewers
       - ''
       - 'Review commit: http://$DOCKER_HOSTNAME:$HGPORT1/r/8/diff/#index_header'
       - 'See other reviews: http://$DOCKER_HOSTNAME:$HGPORT1/r/8/'
     - author: troll@example.com
       id: 12
@@ -627,35 +635,38 @@ Test interaction with multiple commits.
     - reviewer@example.com
     comments:
     - author: author@example.com
       id: 13
       tags: []
       text: ''
     - author: author@example.com
       id: 14
-      tags: []
+      tags:
+      - mozreview-request
       text:
       - Created attachment 5
       - Bug 5 - Parent reviews
       - ''
       - 'Review commit: http://$DOCKER_HOSTNAME:$HGPORT1/r/10/diff/#index_header'
       - 'See other reviews: http://$DOCKER_HOSTNAME:$HGPORT1/r/10/'
     - author: author@example.com
       id: 15
-      tags: []
+      tags:
+      - mozreview-request
       text:
       - Created attachment 6
       - Bug 5 - Parent reviews, second commit
       - ''
       - 'Review commit: http://$DOCKER_HOSTNAME:$HGPORT1/r/11/diff/#index_header'
       - 'See other reviews: http://$DOCKER_HOSTNAME:$HGPORT1/r/11/'
     - author: author@example.com
       id: 16
-      tags: []
+      tags:
+      - mozreview-request
       text:
       - Created attachment 7
       - Bug 5 - Parent reviews, third commit
       - ''
       - 'Review commit: http://$DOCKER_HOSTNAME:$HGPORT1/r/12/diff/#index_header'
       - 'See other reviews: http://$DOCKER_HOSTNAME:$HGPORT1/r/12/'
     component: TestComponent
     depends_on: []
@@ -741,35 +752,38 @@ Verify that a single r+ affects only tha
     - reviewer@example.com
     comments:
     - author: author@example.com
       id: 13
       tags: []
       text: ''
     - author: author@example.com
       id: 14
-      tags: []
+      tags:
+      - mozreview-request
       text:
       - Created attachment 5
       - Bug 5 - Parent reviews
       - ''
       - 'Review commit: http://$DOCKER_HOSTNAME:$HGPORT1/r/10/diff/#index_header'
       - 'See other reviews: http://$DOCKER_HOSTNAME:$HGPORT1/r/10/'
     - author: author@example.com
       id: 15
-      tags: []
+      tags:
+      - mozreview-request
       text:
       - Created attachment 6
       - Bug 5 - Parent reviews, second commit
       - ''
       - 'Review commit: http://$DOCKER_HOSTNAME:$HGPORT1/r/11/diff/#index_header'
       - 'See other reviews: http://$DOCKER_HOSTNAME:$HGPORT1/r/11/'
     - author: author@example.com
       id: 16
-      tags: []
+      tags:
+      - mozreview-request
       text:
       - Created attachment 7
       - Bug 5 - Parent reviews, third commit
       - ''
       - 'Review commit: http://$DOCKER_HOSTNAME:$HGPORT1/r/12/diff/#index_header'
       - 'See other reviews: http://$DOCKER_HOSTNAME:$HGPORT1/r/12/'
     - author: reviewer@example.com
       id: 17
@@ -869,35 +883,38 @@ A comment-only review shouldn't change t
     - reviewer@example.com
     comments:
     - author: author@example.com
       id: 13
       tags: []
       text: ''
     - author: author@example.com
       id: 14
-      tags: []
+      tags:
+      - mozreview-request
       text:
       - Created attachment 5
       - Bug 5 - Parent reviews
       - ''
       - 'Review commit: http://$DOCKER_HOSTNAME:$HGPORT1/r/10/diff/#index_header'
       - 'See other reviews: http://$DOCKER_HOSTNAME:$HGPORT1/r/10/'
     - author: author@example.com
       id: 15
-      tags: []
+      tags:
+      - mozreview-request
       text:
       - Created attachment 6
       - Bug 5 - Parent reviews, second commit
       - ''
       - 'Review commit: http://$DOCKER_HOSTNAME:$HGPORT1/r/11/diff/#index_header'
       - 'See other reviews: http://$DOCKER_HOSTNAME:$HGPORT1/r/11/'
     - author: author@example.com
       id: 16
-      tags: []
+      tags:
+      - mozreview-request
       text:
       - Created attachment 7
       - Bug 5 - Parent reviews, third commit
       - ''
       - 'Review commit: http://$DOCKER_HOSTNAME:$HGPORT1/r/12/diff/#index_header'
       - 'See other reviews: http://$DOCKER_HOSTNAME:$HGPORT1/r/12/'
     - author: reviewer@example.com
       id: 17
@@ -994,35 +1011,38 @@ A 'clear flag' review on a child should 
     - reviewer@example.com
     comments:
     - author: author@example.com
       id: 13
       tags: []
       text: ''
     - author: author@example.com
       id: 14
-      tags: []
+      tags:
+      - mozreview-request
       text:
       - Created attachment 5
       - Bug 5 - Parent reviews
       - ''
       - 'Review commit: http://$DOCKER_HOSTNAME:$HGPORT1/r/10/diff/#index_header'
       - 'See other reviews: http://$DOCKER_HOSTNAME:$HGPORT1/r/10/'
     - author: author@example.com
       id: 15
-      tags: []
+      tags:
+      - mozreview-request
       text:
       - Created attachment 6
       - Bug 5 - Parent reviews, second commit
       - ''
       - 'Review commit: http://$DOCKER_HOSTNAME:$HGPORT1/r/11/diff/#index_header'
       - 'See other reviews: http://$DOCKER_HOSTNAME:$HGPORT1/r/11/'
     - author: author@example.com
       id: 16
-      tags: []
+      tags:
+      - mozreview-request
       text:
       - Created attachment 7
       - Bug 5 - Parent reviews, third commit
       - ''
       - 'Review commit: http://$DOCKER_HOSTNAME:$HGPORT1/r/12/diff/#index_header'
       - 'See other reviews: http://$DOCKER_HOSTNAME:$HGPORT1/r/12/'
     - author: reviewer@example.com
       id: 17
@@ -1129,35 +1149,38 @@ A non-r+ review on a parent should post 
     - reviewer@example.com
     comments:
     - author: author@example.com
       id: 13
       tags: []
       text: ''
     - author: author@example.com
       id: 14
-      tags: []
+      tags:
+      - mozreview-request
       text:
       - Created attachment 5
       - Bug 5 - Parent reviews
       - ''
       - 'Review commit: http://$DOCKER_HOSTNAME:$HGPORT1/r/10/diff/#index_header'
       - 'See other reviews: http://$DOCKER_HOSTNAME:$HGPORT1/r/10/'
     - author: author@example.com
       id: 15
-      tags: []
+      tags:
+      - mozreview-request
       text:
       - Created attachment 6
       - Bug 5 - Parent reviews, second commit
       - ''
       - 'Review commit: http://$DOCKER_HOSTNAME:$HGPORT1/r/11/diff/#index_header'
       - 'See other reviews: http://$DOCKER_HOSTNAME:$HGPORT1/r/11/'
     - author: author@example.com
       id: 16
-      tags: []
+      tags:
+      - mozreview-request
       text:
       - Created attachment 7
       - Bug 5 - Parent reviews, third commit
       - ''
       - 'Review commit: http://$DOCKER_HOSTNAME:$HGPORT1/r/12/diff/#index_header'
       - 'See other reviews: http://$DOCKER_HOSTNAME:$HGPORT1/r/12/'
     - author: reviewer@example.com
       id: 17
@@ -1244,17 +1267,18 @@ when a revised patch is pushed.
     - reviewer@example.com
     comments:
     - author: author@example.com
       id: 21
       tags: []
       text: ''
     - author: author@example.com
       id: 22
-      tags: []
+      tags:
+      - mozreview-request
       text:
       - Created attachment 8
       - Bug 6 - Initial commit to review
       - ''
       - 'Review commit: http://$DOCKER_HOSTNAME:$HGPORT1/r/14/diff/#index_header'
       - 'See other reviews: http://$DOCKER_HOSTNAME:$HGPORT1/r/14/'
     component: TestComponent
     depends_on: []
@@ -1291,26 +1315,28 @@ when a revised patch is pushed.
     - reviewer@example.com
     comments:
     - author: author@example.com
       id: 21
       tags: []
       text: ''
     - author: author@example.com
       id: 22
-      tags: []
+      tags:
+      - mozreview-request
       text:
       - Created attachment 8
       - Bug 6 - Initial commit to review
       - ''
       - 'Review commit: http://$DOCKER_HOSTNAME:$HGPORT1/r/14/diff/#index_header'
       - 'See other reviews: http://$DOCKER_HOSTNAME:$HGPORT1/r/14/'
     - author: author@example.com
       id: 23
-      tags: []
+      tags:
+      - mozreview-request
       text:
       - Comment on attachment 8
       - Bug 6 - Initial commit to review
       - ''
       - 'Review request updated; see interdiff: http://$DOCKER_HOSTNAME:$HGPORT1/r/14/diff/1-2/'
     component: TestComponent
     depends_on: []
     platform: All

--- a/hgext/reviewboard/tests/test-bugzilla-switch-reviewers.t
+++ b/hgext/reviewboard/tests/test-bugzilla-switch-reviewers.t
@@ -64,17 +64,18 @@ Sanity check to ensure we have a review 
     - plusreviewer@example.com
     comments:
     - author: author@example.com
       id: 1
       tags: []
       text: ''
     - author: author@example.com
       id: 2
-      tags: []
+      tags:
+      - mozreview-request
       text:
       - Created attachment 1
       - Bug 1 - Initial commit to review
       - ''
       - 'Review commit: http://$DOCKER_HOSTNAME:$HGPORT1/r/2/diff/#index_header'
       - 'See other reviews: http://$DOCKER_HOSTNAME:$HGPORT1/r/2/'
     component: TestComponent
     depends_on: []
@@ -123,17 +124,18 @@ Leave both an r+ and an r-.
     - plusreviewer@example.com
     comments:
     - author: author@example.com
       id: 1
       tags: []
       text: ''
     - author: author@example.com
       id: 2
-      tags: []
+      tags:
+      - mozreview-request
       text:
       - Created attachment 1
       - Bug 1 - Initial commit to review
       - ''
       - 'Review commit: http://$DOCKER_HOSTNAME:$HGPORT1/r/2/diff/#index_header'
       - 'See other reviews: http://$DOCKER_HOSTNAME:$HGPORT1/r/2/'
     - author: plusreviewer@example.com
       id: 3
@@ -205,17 +207,18 @@ New r? should be added, old r+ and r- sh
     - plusreviewer@example.com
     comments:
     - author: author@example.com
       id: 1
       tags: []
       text: ''
     - author: author@example.com
       id: 2
-      tags: []
+      tags:
+      - mozreview-request
       text:
       - Created attachment 1
       - Bug 1 - Initial commit to review
       - ''
       - 'Review commit: http://$DOCKER_HOSTNAME:$HGPORT1/r/2/diff/#index_header'
       - 'See other reviews: http://$DOCKER_HOSTNAME:$HGPORT1/r/2/'
     - author: plusreviewer@example.com
       id: 3
@@ -234,17 +237,18 @@ New r? should be added, old r+ and r- sh
       - Comment on attachment 1
       - Bug 1 - Initial commit to review
       - ''
       - http://$DOCKER_HOSTNAME:$HGPORT1/r/2/#review2
       - ''
       - there are problems
     - author: author@example.com
       id: 5
-      tags: []
+      tags:
+      - mozreview-request
       text:
       - Comment on attachment 1
       - Bug 1 - Initial commit to review
       - ''
       - 'Review request updated; see interdiff: http://$DOCKER_HOSTNAME:$HGPORT1/r/2/diff/1-2/'
     component: TestComponent
     depends_on: []
     platform: All

--- a/hgext/reviewboard/tests/test-bugzilla.t
+++ b/hgext/reviewboard/tests/test-bugzilla.t
@@ -75,17 +75,18 @@ Publishing the review will add an attach
     cc: []
     comments:
     - author: default@example.com
       id: 1
       tags: []
       text: ''
     - author: default@example.com
       id: 3
-      tags: []
+      tags:
+      - mozreview-request
       text:
       - Created attachment 1
       - Bug 1 - Foo 1
       - ''
       - 'Review commit: http://$DOCKER_HOSTNAME:$HGPORT1/r/2/diff/#index_header'
       - 'See other reviews: http://$DOCKER_HOSTNAME:$HGPORT1/r/2/'
     component: TestComponent
     depends_on: []
@@ -139,26 +140,28 @@ published.
     cc: []
     comments:
     - author: default@example.com
       id: 1
       tags: []
       text: ''
     - author: default@example.com
       id: 3
-      tags: []
+      tags:
+      - mozreview-request
       text:
       - Created attachment 1
       - Bug 1 - Foo 1
       - ''
       - 'Review commit: http://$DOCKER_HOSTNAME:$HGPORT1/r/2/diff/#index_header'
       - 'See other reviews: http://$DOCKER_HOSTNAME:$HGPORT1/r/2/'
     - author: default@example.com
       id: 4
-      tags: []
+      tags:
+      - mozreview-request
       text:
       - Comment on attachment 1
       - Bug 1 - Foo 1
       - ''
       - 'Review request updated; see interdiff: http://$DOCKER_HOSTNAME:$HGPORT1/r/2/diff/1-2/'
     component: TestComponent
     depends_on: []
     platform: All
@@ -198,26 +201,28 @@ can happen if a reviewer is manually add
     - reviewer@example.com
     comments:
     - author: default@example.com
       id: 1
       tags: []
       text: ''
     - author: default@example.com
       id: 3
-      tags: []
+      tags:
+      - mozreview-request
       text:
       - Created attachment 1
       - Bug 1 - Foo 1
       - ''
       - 'Review commit: http://$DOCKER_HOSTNAME:$HGPORT1/r/2/diff/#index_header'
       - 'See other reviews: http://$DOCKER_HOSTNAME:$HGPORT1/r/2/'
     - author: default@example.com
       id: 4
-      tags: []
+      tags:
+      - mozreview-request
       text:
       - Comment on attachment 1
       - Bug 1 - Foo 1
       - ''
       - 'Review request updated; see interdiff: http://$DOCKER_HOSTNAME:$HGPORT1/r/2/diff/1-2/'
     component: TestComponent
     depends_on: []
     platform: All
@@ -271,17 +276,18 @@ Ensure r? in the commit description sets
     - reviewer@example.com
     comments:
     - author: default@example.com
       id: 2
       tags: []
       text: ''
     - author: default@example.com
       id: 5
-      tags: []
+      tags:
+      - mozreview-request
       text:
       - Created attachment 2
       - Bug 2 - Foo 1
       - ''
       - 'Review commit: http://$DOCKER_HOSTNAME:$HGPORT1/r/4/diff/#index_header'
       - 'See other reviews: http://$DOCKER_HOSTNAME:$HGPORT1/r/4/'
     component: TestComponent
     depends_on: []

--- a/hgext/reviewboard/tests/test-review-request-closed-discarded.t
+++ b/hgext/reviewboard/tests/test-review-request-closed-discarded.t
@@ -75,26 +75,28 @@
     cc: []
     comments:
     - author: default@example.com
       id: 1
       tags: []
       text: ''
     - author: default@example.com
       id: 2
-      tags: []
+      tags:
+      - mozreview-request
       text:
       - Created attachment 1
       - Bug 1 - Foo 1
       - ''
       - 'Review commit: http://$DOCKER_HOSTNAME:$HGPORT1/r/2/diff/#index_header'
       - 'See other reviews: http://$DOCKER_HOSTNAME:$HGPORT1/r/2/'
     - author: default@example.com
       id: 3
-      tags: []
+      tags:
+      - mozreview-request
       text:
       - Created attachment 2
       - Bug 1 - Foo 2
       - ''
       - 'Review commit: http://$DOCKER_HOSTNAME:$HGPORT1/r/3/diff/#index_header'
       - 'See other reviews: http://$DOCKER_HOSTNAME:$HGPORT1/r/3/'
     component: TestComponent
     depends_on: []
@@ -266,26 +268,28 @@ The review attachment should be marked a
     cc: []
     comments:
     - author: default@example.com
       id: 1
       tags: []
       text: ''
     - author: default@example.com
       id: 2
-      tags: []
+      tags:
+      - mozreview-request
       text:
       - Created attachment 1
       - Bug 1 - Foo 1
       - ''
       - 'Review commit: http://$DOCKER_HOSTNAME:$HGPORT1/r/2/diff/#index_header'
       - 'See other reviews: http://$DOCKER_HOSTNAME:$HGPORT1/r/2/'
     - author: default@example.com
       id: 3
-      tags: []
+      tags:
+      - mozreview-request
       text:
       - Created attachment 2
       - Bug 1 - Foo 2
       - ''
       - 'Review commit: http://$DOCKER_HOSTNAME:$HGPORT1/r/3/diff/#index_header'
       - 'See other reviews: http://$DOCKER_HOSTNAME:$HGPORT1/r/3/'
     component: TestComponent
     depends_on: []
@@ -518,26 +522,28 @@ There should still not be a visible atta
     cc: []
     comments:
     - author: default@example.com
       id: 1
       tags: []
       text: ''
     - author: default@example.com
       id: 2
-      tags: []
+      tags:
+      - mozreview-request
       text:
       - Created attachment 1
       - Bug 1 - Foo 1
       - ''
       - 'Review commit: http://$DOCKER_HOSTNAME:$HGPORT1/r/2/diff/#index_header'
       - 'See other reviews: http://$DOCKER_HOSTNAME:$HGPORT1/r/2/'
     - author: default@example.com
       id: 3
-      tags: []
+      tags:
+      - mozreview-request
       text:
       - Created attachment 2
       - Bug 1 - Foo 2
       - ''
       - 'Review commit: http://$DOCKER_HOSTNAME:$HGPORT1/r/3/diff/#index_header'
       - 'See other reviews: http://$DOCKER_HOSTNAME:$HGPORT1/r/3/'
     component: TestComponent
     depends_on: []
@@ -708,26 +714,28 @@ The attachment for the review request sh
     cc: []
     comments:
     - author: default@example.com
       id: 1
       tags: []
       text: ''
     - author: default@example.com
       id: 2
-      tags: []
+      tags:
+      - mozreview-request
       text:
       - Created attachment 1
       - Bug 1 - Foo 1
       - ''
       - 'Review commit: http://$DOCKER_HOSTNAME:$HGPORT1/r/2/diff/#index_header'
       - 'See other reviews: http://$DOCKER_HOSTNAME:$HGPORT1/r/2/'
     - author: default@example.com
       id: 3
-      tags: []
+      tags:
+      - mozreview-request
       text:
       - Created attachment 2
       - Bug 1 - Foo 2
       - ''
       - 'Review commit: http://$DOCKER_HOSTNAME:$HGPORT1/r/3/diff/#index_header'
       - 'See other reviews: http://$DOCKER_HOSTNAME:$HGPORT1/r/3/'
     component: TestComponent
     depends_on: []
@@ -912,53 +920,58 @@ Pushing to a discarded review series wil
     cc: []
     comments:
     - author: default@example.com
       id: 1
       tags: []
       text: ''
     - author: default@example.com
       id: 2
-      tags: []
+      tags:
+      - mozreview-request
       text:
       - Created attachment 1
       - Bug 1 - Foo 1
       - ''
       - 'Review commit: http://$DOCKER_HOSTNAME:$HGPORT1/r/2/diff/#index_header'
       - 'See other reviews: http://$DOCKER_HOSTNAME:$HGPORT1/r/2/'
     - author: default@example.com
       id: 3
-      tags: []
+      tags:
+      - mozreview-request
       text:
       - Created attachment 2
       - Bug 1 - Foo 2
       - ''
       - 'Review commit: http://$DOCKER_HOSTNAME:$HGPORT1/r/3/diff/#index_header'
       - 'See other reviews: http://$DOCKER_HOSTNAME:$HGPORT1/r/3/'
     - author: default@example.com
       id: 4
-      tags: []
+      tags:
+      - mozreview-request
       text:
       - Created attachment 3
       - Bug 1 - Foo 1
       - ''
       - 'Review commit: http://$DOCKER_HOSTNAME:$HGPORT1/r/5/diff/#index_header'
       - 'See other reviews: http://$DOCKER_HOSTNAME:$HGPORT1/r/5/'
     - author: default@example.com
       id: 5
-      tags: []
+      tags:
+      - mozreview-request
       text:
       - Created attachment 4
       - Bug 1 - Foo 2
       - ''
       - 'Review commit: http://$DOCKER_HOSTNAME:$HGPORT1/r/6/diff/#index_header'
       - 'See other reviews: http://$DOCKER_HOSTNAME:$HGPORT1/r/6/'
     - author: default@example.com
       id: 6
-      tags: []
+      tags:
+      - mozreview-request
       text:
       - Created attachment 5
       - Bug 1 - Foo 3
       - ''
       - 'Review commit: http://$DOCKER_HOSTNAME:$HGPORT1/r/7/diff/#index_header'
       - 'See other reviews: http://$DOCKER_HOSTNAME:$HGPORT1/r/7/'
     component: TestComponent
     depends_on: []

--- a/hgext/reviewboard/tests/test-unicode.t
+++ b/hgext/reviewboard/tests/test-unicode.t
@@ -92,17 +92,18 @@ The globbing is patching over a bug in m
     cc: []
     comments:
     - author: author@example.com
       id: 1
       tags: []
       text: ''
     - author: author@example.com
       id: 2
-      tags: []
+      tags:
+      - mozreview-request
       text:
       - Created attachment 1
       - "Bug 1 - Initial commit to review \u2019 \u3053"
       - ''
       - 'Review commit: http://$DOCKER_HOSTNAME:$HGPORT1/r/2/diff/#index_header'
       - 'See other reviews: http://$DOCKER_HOSTNAME:$HGPORT1/r/2/'
     - author: author@example.com
       id: 3

--- a/pylib/mozreview/mozreview/bugzilla/client.py
+++ b/pylib/mozreview/mozreview/bugzilla/client.py
@@ -174,16 +174,17 @@ class BugzillaAttachmentUpdates(object):
                 })
 
     @xmlrpc_to_bugzilla_errors
     def do_updates(self):
         logger.info('Doing attachment updates for bug %s' % self.bug_id)
         params = self.bugzilla._auth_params({
             'bug_id': self.bug_id,
             'attachments': self.creates + self.updates,
+            'comment_tags': [self.bugzilla.review_request_comment_tag],
         })
 
         results = self.bugzilla.proxy.MozReview.attachments(params)
 
         # The above Bugzilla call is wrapped in a single database transaction
         # and should thus either succeed in creating and updating all
         # attachments or will throw an exception and roll back all changes.
         # However, just to be sure, we check the results.  There's not much
@@ -239,16 +240,17 @@ class Bugzilla(object):
     At the moment this uses the XMLRPC API.  It should probably be converted
     to REST at some point.
 
     General FIXME: try to get more specific errors out of xmlrpclib.Fault
     exceptions.
     """
 
     user_fields = ['id', 'email', 'real_name', 'can_login']
+    review_request_comment_tag = 'mozreview-request'
 
     def __init__(self, api_key=None, xmlrpc_url=None):
         self.api_key = api_key
         self._transport = None
         self._proxy = None
 
         siteconfig = SiteConfiguration.objects.get_current()