diff --git a/test/unit/task_mailer_test.rb b/test/unit/task_mailer_test.rb
index bd08fa0..60c3cc9 100644
--- a/test/unit/task_mailer_test.rb
+++ b/test/unit/task_mailer_test.rb
@@ -37,6 +37,49 @@ class TaskMailerTest < Test::Unit::TestCase
     TaskMailer.deliver_task_finished(task)
   end
 
+  should 'be able to send a "task cancelled" message' do
+
+    task = mock()
+    task.expects(:cancel_message).returns('the message')
+    task.expects(:description).returns('the task')
+
+    requestor = mock()
+    requestor.expects(:email).returns('requestor@example.com')
+    requestor.expects(:name).returns('my name')
+
+    environment = mock()
+    environment.expects(:contact_email).returns('sender@example.com')
+    environment.expects(:default_hostname).returns('example.com')
+    environment.expects(:name).returns('example')
+
+    task.expects(:requestor).returns(requestor).at_least_once
+    requestor.expects(:environment).returns(environment).at_least_once
+
+    TaskMailer.deliver_task_cancelled(task)
+  end
+
+  should 'be able to send a "task created" message' do
+
+    task = mock()
+    task.expects(:create_message).returns('the message')
+    task.expects(:description).returns('the task')
+
+    requestor = mock()
+    requestor.expects(:email).returns('requestor@example.com')
+    requestor.expects(:name).returns('my name')
+
+    environment = mock()
+    environment.expects(:contact_email).returns('sender@example.com')
+    environment.expects(:default_hostname).returns('example.com')
+    environment.expects(:name).returns('example')
+
+    task.expects(:requestor).returns(requestor).at_least_once
+    requestor.expects(:environment).returns(environment).at_least_once
+
+    TaskMailer.deliver_task_created(task)
+  end
+
+
   private
     def read_fixture(action)
       IO.readlines("#{FIXTURES_PATH}/task_mailer/#{action}")
--
libgit2 0.21.2