diff --git a/djrill/tests.py b/djrill/tests.py
index e69de29..70bd17b 100644
--- a/djrill/tests.py
+++ b/djrill/tests.py
@@ -0,0 +1,51 @@
+from django.conf import settings
+from django.core.exceptions import ImproperlyConfigured
+from django.test import TestCase
+
+from djrill.mail import DjrillMessage
+
+
+class DjrillMessageTests(TestCase):
+    def setUp(self):
+        self.subject = "Djrill baby djrill."
+        self.from_email = "test@example"
+        self.to = ["King Kong <kingkong@example.com>",
+            "Cheetah <cheetah@example.com", "bubbles@example.com"]
+        self.text_content = "Wonderful fallback text content."
+        self.html_content = "<h1>That's a nice HTML email right there.</h1>"
+        self.tags = ["track", "this"]
+
+    def test_djrill_message_success(self):
+        msg = DjrillMessage(self.subject, self.text_content, self.from_email,
+            self.to, tags=self.tags)
+
+        self.assertIsInstance(msg, DjrillMessage)
+        self.assertEqual(msg.body, self.text_content)
+        self.assertEqual(msg.recipients(), self.to)
+        self.assertEqual(msg.tags, self.tags)
+
+    def test_djrill_message_html_success(self):
+        msg = DjrillMessage(self.subject, self.text_content, self.from_email,
+            self.to, tags=self.tags)
+        msg.attach_alternative(self.html_content, "text/html")
+
+        self.assertEqual(msg.alternatives[0][0], self.html_content)
+
+    def test_djrill_message_tag_failure(self):
+        with self.assertRaises(ImproperlyConfigured):
+            DjrillMessage(self.subject, self.text_content, self.from_email,
+                self.to, tags=["_fail"])
+
+    def test_djrill_message_tag_skip(self):
+        """
+        Test that tags over 50 chars are not included in the tags list.
+        """
+        tags = ["works", "awesomesauce",
+         "iwilltestmycodeiwilltestmycodeiwilltestmycodeiwilltestmycode"]
+        msg = DjrillMessage(self.subject, self.text_content, self.from_email,
+            self.to, tags=tags)
+
+        self.assertIsInstance(msg, DjrillMessage)
+        self.assertIn(tags[0], msg.tags)
+        self.assertIn(tags[1], msg.tags)
+        self.assertNotIn(tags[2], msg.tags)