diff --git a/test/fixtures/account/join_codes.yml b/test/fixtures/account/join_codes.yml
index daba73e66..855c67c85 100644
--- a/test/fixtures/account/join_codes.yml
+++ b/test/fixtures/account/join_codes.yml
@@ -2,3 +2,4 @@ sole:
   code: 1234-5678-9XYZ
   usage_count: 0
   usage_limit: 10
+  account: 37s
diff --git a/test/fixtures/boards.yml b/test/fixtures/boards.yml
index d66e9b964..99b10231a 100644
--- a/test/fixtures/boards.yml
+++ b/test/fixtures/boards.yml
@@ -2,8 +2,10 @@ writebook:
   name: Writebook
   creator: david
   all_access: true
+  account: 37s
 
 private:
   name: Private board
   creator: kevin
   all_access: false
+  account: 37s
diff --git a/test/fixtures/cards.yml b/test/fixtures/cards.yml
index 94ef3e0ad..e255496c4 100644
--- a/test/fixtures/cards.yml
+++ b/test/fixtures/cards.yml
@@ -7,6 +7,7 @@ logo:
   created_at: <%= 1.week.ago %>
   status: published
   last_active_at: <%= 1.week.ago %>
+  account: 37s
 
 layout:
   board: writebook
@@ -16,6 +17,7 @@ layout:
   created_at: <%= 1.week.ago %>
   status: published
   last_active_at: <%= 1.week.ago %>
+  account: 37s
 
 text:
   board: writebook
@@ -25,6 +27,7 @@ text:
   created_at: <%= 1.week.ago %>
   status: published
   last_active_at: <%= 1.week.ago %>
+  account: 37s
 
 shipping:
   board: writebook
@@ -34,6 +37,7 @@ shipping:
   created_at: <%= 1.week.ago %>
   status: published
   last_active_at: <%= 1.week.ago %>
+  account: 37s
 
 buy_domain:
   board: writebook
@@ -42,4 +46,5 @@ buy_domain:
   created_at: <%= 1.week.ago %>
   status: published
   last_active_at: <%= 1.week.ago %>
+  account: 37s
 
diff --git a/test/fixtures/columns.yml b/test/fixtures/columns.yml
index f10ad1138..39ce731c4 100644
--- a/test/fixtures/columns.yml
+++ b/test/fixtures/columns.yml
@@ -4,21 +4,25 @@ writebook_triage:
   color: "var(--color-card-4)"
   board: writebook
   position: 0
+  account: 37s
 
 writebook_in_progress:
   name: In progress
   color: "var(--color-card-2)"
   board: writebook
   position: 1
+  account: 37s
 
 writebook_on_hold:
   name: On Hold
   color: "var(--color-card-4)"
   board: writebook
   position: 2
+  account: 37s
 
 writebook_review:
   name: Review
   color: "var(--color-card-3)"
   board: writebook
   position: 3
+  account: 37s
diff --git a/test/fixtures/comments.yml b/test/fixtures/comments.yml
index ede5f327e..affafbd6a 100644
--- a/test/fixtures/comments.yml
+++ b/test/fixtures/comments.yml
@@ -2,39 +2,48 @@ logo_1:
   card: logo
   creator: system
   created_at: <%= 1.week.ago %>
+  account: 37s
 
 logo_agreement_jz:
   card: logo
   creator: jz
   created_at: <%= 2.days.ago %>
+  account: 37s
 
 logo_3:
   card: logo
   creator: system
   created_at: <%= 1.day.ago %>
+  account: 37s
 
 logo_agreement_kevin:
   card: logo
   creator: kevin
   created_at: <%= 2.hours.ago %>
+  account: 37s
 
 logo_5:
   card: logo
   creator: system
   created_at: <%= 1.hour.ago %>
+  account: 37s
 
 layout_1:
   card: layout
   creator: system
+  account: 37s
 
 layout_overflowing_david:
   card: layout
   creator: david
+  account: 37s
 
 text_1:
   card: text
   creator: system
+  account: 37s
 
 shipping_1:
   card: shipping
   creator: system
+  account: 37s
diff --git a/test/fixtures/events.yml b/test/fixtures/events.yml
index f8dc7dc38..60f8dadcc 100644
--- a/test/fixtures/events.yml
+++ b/test/fixtures/events.yml
@@ -4,6 +4,7 @@ logo_published:
   eventable: logo (Card)
   action: card_published
   created_at: <%= 1.week.ago %>
+  account: 37s
 
 logo_assignment_jz:
   creator: david
@@ -12,6 +13,7 @@ logo_assignment_jz:
   action: card_assigned
   particulars: <%= { assignee_ids: [ ActiveRecord::FixtureSet.identify(:jz) ] }.to_json %>
   created_at: <%= 1.week.ago + 1.hour %>
+  account: 37s
 
 logo_assignment_david:
   creator: david
@@ -20,6 +22,7 @@ logo_assignment_david:
   action: card_assigned
   particulars: <%= { assignee_ids: [ ActiveRecord::FixtureSet.identify(:david) ] }.to_json %>
   created_at: <%= 1.week.ago + 1.hour %>
+  account: 37s
 
 logo_assignment_km:
   creator: david
@@ -28,6 +31,7 @@ logo_assignment_km:
   action: card_assigned
   particulars: <%= { assignee_ids: [ ActiveRecord::FixtureSet.identify(:kevin) ] }.to_json %>
   created_at: <%= 1.day.ago %>
+  account: 37s
 
 layout_published:
   creator: david
@@ -35,6 +39,7 @@ layout_published:
   eventable: layout (Card)
   action: card_published
   created_at: <%= 1.week.ago %>
+  account: 37s
 
 layout_commented:
   creator: david
@@ -42,6 +47,7 @@ layout_commented:
   eventable: layout_overflowing_david (Comment)
   action: comment_created
   created_at: <%= 1.week.ago %>
+  account: 37s
 
 layout_assignment_jz:
   creator: david
@@ -50,6 +56,7 @@ layout_assignment_jz:
   action: card_assigned
   particulars: <%= { assignee_ids: [ ActiveRecord::FixtureSet.identify(:jz) ] }.to_json %>
   created_at: <%= 1.hour.ago %>
+  account: 37s
 
 text_published:
   creator: kevin
@@ -57,6 +64,7 @@ text_published:
   eventable: text (Card)
   action: card_published
   created_at: <%= 1.week.ago %>
+  account: 37s
 
 shipping_published:
   creator: kevin
@@ -64,6 +72,7 @@ shipping_published:
   eventable: shipping (Card)
   action: card_published
   created_at: <%= 1.week.ago %>
+  account: 37s
 
 shipping_closed:
   creator: kevin
@@ -71,3 +80,4 @@ shipping_closed:
   eventable: shipping (Card)
   action: card_closed
   created_at: <%= 2.days.ago %>
+  account: 37s
diff --git a/test/fixtures/filters.yml b/test/fixtures/filters.yml
index 18d91f458..5396d37dc 100644
--- a/test/fixtures/filters.yml
+++ b/test/fixtures/filters.yml
@@ -4,3 +4,4 @@ jz_assignments:
   assignees: jz
   fields: <%= { indexed_by: :all, sorted_by: :newest }.to_json %>
   params_digest: <%= Filter.digest_params({ indexed_by: :all, sorted_by: :newest, tag_ids: [ ActiveRecord::FixtureSet.identify(:mobile) ], assignee_ids: [ ActiveRecord::FixtureSet.identify(:jz) ] }) %>
+  account: 37s
diff --git a/test/fixtures/mentions.yml b/test/fixtures/mentions.yml
index 77963954c..ab12eec25 100644
--- a/test/fixtures/mentions.yml
+++ b/test/fixtures/mentions.yml
@@ -2,8 +2,10 @@ logo_card_david_mention_by_jz:
   source: logo (Card)
   mentioner: jz
   mentionee: david
+  account: 37s
 
 logo_comment_david_mention_by_jz:
   source: logo_agreement_jz (Comment)
   mentioner: jz
   mentionee: david
+  account: 37s
diff --git a/test/fixtures/notifications.yml b/test/fixtures/notifications.yml
index 8c88d23d0..2d0e20c1c 100644
--- a/test/fixtures/notifications.yml
+++ b/test/fixtures/notifications.yml
@@ -3,27 +3,32 @@ logo_published_kevin:
   source: logo_published (Event)
   created_at: <%= 1.week.ago %>
   creator: david
+  account: 37s
 
 logo_assignment_kevin:
   user: kevin
   source: logo_assignment_km (Event)
   created_at: <%= 1.week.ago %>
   creator: david
+  account: 37s
 
 layout_commented_kevin:
   user: kevin
   source: layout_commented (Event)
   created_at: <%= 1.week.ago %>
   creator: david
+  account: 37s
 
 logo_card_david_mention_by_jz:
   user: david
   source: logo_card_david_mention_by_jz (Mention)
   created_at: <%= 1.week.ago %>
   creator: david
+  account: 37s
 
 logo_comment_david_mention_by_jz:
   user: david
   source: logo_comment_david_mention_by_jz (Mention)
   created_at: <%= 1.week.ago %>
   creator: david
+  account: 37s
diff --git a/test/fixtures/reactions.yml b/test/fixtures/reactions.yml
index cfaa1a11d..3802ec824 100644
--- a/test/fixtures/reactions.yml
+++ b/test/fixtures/reactions.yml
@@ -1,9 +1,11 @@
 kevin:
-  content: "👍" 
+  content: "👍"
   comment: logo_agreement_jz
   reacter: kevin
+  account: 37s
 
 david:
-  content: "👍" 
+  content: "👍"
   comment: logo_agreement_jz
   reacter: david
+  account: 37s
diff --git a/test/fixtures/tags.yml b/test/fixtures/tags.yml
index a0c771fab..47139cd24 100644
--- a/test/fixtures/tags.yml
+++ b/test/fixtures/tags.yml
@@ -1,5 +1,7 @@
 web:
   title: web
+  account: 37s
 
 mobile:
   title: mobile
+  account: 37s
diff --git a/test/fixtures/users.yml b/test/fixtures/users.yml
index 93a70eea6..d2fb815ab 100644
--- a/test/fixtures/users.yml
+++ b/test/fixtures/users.yml
@@ -2,17 +2,21 @@ david:
   name: David
   role: member
   membership: david_in_37signals
+  account: 37s
 
 jz:
   name: JZ
   role: member
   membership: jz_in_37signals
+  account: 37s
 
 kevin:
   name: Kevin
   role: admin
   membership: kevin_in_37signals
+  account: 37s
 
 system:
   name: System
   role: system
+  account: 37s
diff --git a/test/fixtures/webhooks.yml b/test/fixtures/webhooks.yml
index d70c919f4..f9a6d285b 100644
--- a/test/fixtures/webhooks.yml
+++ b/test/fixtures/webhooks.yml
@@ -5,6 +5,7 @@ active:
   signing_secret: p94Bx2HjempCdYB4DTyZkY1b
   subscribed_actions: '<%= %w[ card_published card_assigned card_closed ].to_json %>'
   board: writebook
+  account: 37s
 
 inactive:
   active: false
@@ -13,3 +14,4 @@ inactive:
   signing_secret: H8ms8ADcV92v2x17hnLEiL5m
   subscribed_actions: '<%= %w[ card_published card_assigned card_closed ].to_json %>'
   board: private
+  account: 37s
diff --git a/test/test_helper.rb b/test/test_helper.rb
index bc12b65f5..86ffce440 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -51,6 +51,10 @@ module ActiveSupport
       #             how to set Current.user without needing both a session *and* an account
       Current.account = accounts("37s")
     end
+
+    teardown do
+      Current.clear_all
+    end
   end
 end