diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index e09deacfb4..6965087b25 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -25,17 +25,23 @@ jobs:
             db_adapter: sqlite
           - mode: MySQL
             db_adapter: mysql
+            db_image: mysql:8.0
+            db_health: mysqladmin ping
+          - mode: MariaDB
+            db_adapter: mysql
+            db_image: mariadb:11
+            db_health: healthcheck.sh --connect --innodb_initialized
 
     services:
-      mysql:
-        image: mysql:8.0
+      db:
+        image: ${{ matrix.db_image || 'mysql:8.0' }}
         env:
           MYSQL_ALLOW_EMPTY_PASSWORD: yes
           MYSQL_DATABASE: fizzy_test
         ports:
           - 3306:3306
         options: >-
-          --health-cmd="mysqladmin ping"
+          --health-cmd="${{ matrix.db_health || 'mysqladmin ping' }}"
           --health-interval=10s
           --health-timeout=5s
           --health-retries=3
diff --git a/app/models/event/particulars.rb b/app/models/event/particulars.rb
index 31ecd66bfa..de8cecf26e 100644
--- a/app/models/event/particulars.rb
+++ b/app/models/event/particulars.rb
@@ -2,6 +2,7 @@ module Event::Particulars
   extend ActiveSupport::Concern
 
   included do
+    attribute :particulars, :json
     store_accessor :particulars, :assignee_ids
   end
 
diff --git a/app/models/filter/fields.rb b/app/models/filter/fields.rb
index 0e1c62e0a4..fbbc8c3b09 100644
--- a/app/models/filter/fields.rb
+++ b/app/models/filter/fields.rb
@@ -30,6 +30,7 @@ def indexed_by_human_name(index)
   end
 
   included do
+    attribute :fields, :json
     store_accessor :fields, :assignment_status, :indexed_by, :sorted_by, :terms,
       :card_ids, :creation, :closure
 
diff --git a/test/fixtures/events.yml b/test/fixtures/events.yml
index ea4f2f465c..bfef6bbea2 100644
--- a/test/fixtures/events.yml
+++ b/test/fixtures/events.yml
@@ -13,7 +13,7 @@ logo_assignment_jz:
   board: writebook_uuid
   eventable: logo_uuid (Card)
   action: card_assigned
-  particulars: <%= { assignee_ids: [ ActiveRecord::FixtureSet.identify("jz", :uuid) ] }.to_json %>
+  particulars: '<%= { assignee_ids: [ ActiveRecord::FixtureSet.identify("jz", :uuid) ] }.to_json %>'
   created_at: <%= 1.week.ago + 1.hour %>
   account: 37s_uuid
 
@@ -23,7 +23,7 @@ logo_assignment_david:
   board: writebook_uuid
   eventable: logo_uuid (Card)
   action: card_assigned
-  particulars: <%= { assignee_ids: [ ActiveRecord::FixtureSet.identify("david", :uuid) ] }.to_json %>
+  particulars: '<%= { assignee_ids: [ ActiveRecord::FixtureSet.identify("david", :uuid) ] }.to_json %>'
   created_at: <%= 1.week.ago + 1.hour %>
   account: 37s_uuid
 
@@ -33,7 +33,7 @@ logo_assignment_km:
   board: writebook_uuid
   eventable: logo_uuid (Card)
   action: card_assigned
-  particulars: <%= { assignee_ids: [ ActiveRecord::FixtureSet.identify("kevin", :uuid) ] }.to_json %>
+  particulars: '<%= { assignee_ids: [ ActiveRecord::FixtureSet.identify("kevin", :uuid) ] }.to_json %>'
   created_at: <%= 1.day.ago %>
   account: 37s_uuid
 
@@ -61,7 +61,7 @@ layout_assignment_jz:
   board: writebook_uuid
   eventable: layout_uuid (Card)
   action: card_assigned
-  particulars: <%= { assignee_ids: [ ActiveRecord::FixtureSet.identify("jz", :uuid) ] }.to_json %>
+  particulars: '<%= { assignee_ids: [ ActiveRecord::FixtureSet.identify("jz", :uuid) ] }.to_json %>'
   created_at: <%= 1.hour.ago %>
   account: 37s_uuid
 
diff --git a/test/fixtures/filters.yml b/test/fixtures/filters.yml
index 5363f7168e..0d8fe24c8a 100644
--- a/test/fixtures/filters.yml
+++ b/test/fixtures/filters.yml
@@ -1,6 +1,6 @@
 jz_assignments:
   id: <%= ActiveRecord::FixtureSet.identify("jz_assignments", :uuid) %>
   creator: david_uuid
-  fields: <%= { indexed_by: :all, sorted_by: :newest }.to_json %>
+  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", :uuid) ], assignee_ids: [ ActiveRecord::FixtureSet.identify("jz", :uuid) ] }) %>
   account: 37s_uuid