diff --git a/test/test-engine.vala b/test/test-engine.vala
index 2edf95c6..9f88b85a 100644
--- a/test/test-engine.vala
+++ b/test/test-engine.vala
@@ -83,10 +83,12 @@ int main(string[] args) {
     engine.add_suite(new Geary.Outbox.EmailIdentifierTest().get_suite());
     engine.add_suite(new Geary.RFC822.MailboxAddressTest().get_suite());
     engine.add_suite(new Geary.RFC822.MailboxAddressesTest().get_suite());
-    engine.add_suite(new Geary.RFC822.MessageTest().get_suite());
     engine.add_suite(new Geary.RFC822.MessageDataTest().get_suite());
     engine.add_suite(new Geary.RFC822.PartTest().get_suite());
     engine.add_suite(new Geary.RFC822.Utils.Test().get_suite());
+    // Message requires all of the rest of the package working, so put
+    // last
+    engine.add_suite(new Geary.RFC822.MessageTest().get_suite());
     engine.add_suite(new Geary.String.Test().get_suite());
     engine.add_suite(new Geary.ComposedEmailTest().get_suite());