diff --git a/test/engine/rfc822-mailbox-address-test.vala b/test/engine/rfc822/rfc822-mailbox-address-test.vala
similarity index 100%
rename from test/engine/rfc822-mailbox-address-test.vala
rename to test/engine/rfc822/rfc822-mailbox-address-test.vala
diff --git a/test/engine/rfc822-mailbox-addresses-test.vala b/test/engine/rfc822/rfc822-mailbox-addresses-test.vala
similarity index 100%
rename from test/engine/rfc822-mailbox-addresses-test.vala
rename to test/engine/rfc822/rfc822-mailbox-addresses-test.vala
diff --git a/test/engine/rfc822-message-data-test.vala b/test/engine/rfc822/rfc822-message-data-test.vala
similarity index 100%
rename from test/engine/rfc822-message-data-test.vala
rename to test/engine/rfc822/rfc822-message-data-test.vala
diff --git a/test/engine/rfc822-message-test.vala b/test/engine/rfc822/rfc822-message-test.vala
similarity index 100%
rename from test/engine/rfc822-message-test.vala
rename to test/engine/rfc822/rfc822-message-test.vala
diff --git a/test/engine/rfc822-part-test.vala b/test/engine/rfc822/rfc822-part-test.vala
similarity index 100%
rename from test/engine/rfc822-part-test.vala
rename to test/engine/rfc822/rfc822-part-test.vala
diff --git a/test/engine/rfc822-utils-test.vala b/test/engine/rfc822/rfc822-utils-test.vala
similarity index 100%
rename from test/engine/rfc822-utils-test.vala
rename to test/engine/rfc822/rfc822-utils-test.vala
diff --git a/test/meson.build b/test/meson.build
index 7de5e857..57f33a86 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -54,12 +54,12 @@ geary_test_engine_sources = [
   'engine/imap-engine/imap-engine-generic-account-test.vala',
   'engine/mime/mime-content-type-test.vala',
   'engine/outbox/outbox-email-identifier-test.vala',
-  'engine/rfc822-mailbox-address-test.vala',
-  'engine/rfc822-mailbox-addresses-test.vala',
-  'engine/rfc822-message-test.vala',
-  'engine/rfc822-message-data-test.vala',
-  'engine/rfc822-part-test.vala',
-  'engine/rfc822-utils-test.vala',
+  'engine/rfc822/rfc822-mailbox-address-test.vala',
+  'engine/rfc822/rfc822-mailbox-addresses-test.vala',
+  'engine/rfc822/rfc822-message-test.vala',
+  'engine/rfc822/rfc822-message-data-test.vala',
+  'engine/rfc822/rfc822-part-test.vala',
+  'engine/rfc822/rfc822-utils-test.vala',
   'engine/util-ascii-test.vala',
   'engine/util-config-file-test.vala',
   'engine/util-html-test.vala',