diff --git a/spec/models/notice_observer_spec.rb b/spec/models/notice_observer_spec.rb
index efdc9e3..f84a6fc 100644
--- a/spec/models/notice_observer_spec.rb
+++ b/spec/models/notice_observer_spec.rb
@@ -1,3 +1,46 @@
 require 'spec_helper'
 
+describe NoticeObserver do
+  describe "email notifications (configured individually for each app)" do
+    custom_thresholds = [2, 4, 8, 16, 32, 64]
 
+    before do
+      Errbit::Config.per_app_email_at_notices = true
+      @app = Fabricate(:app_with_watcher, :email_at_notices => custom_thresholds)
+      @err = Fabricate(:err, :problem => Fabricate(:problem, :app => @app))
+    end
+
+    after do
+      Errbit::Config.per_app_email_at_notices = false
+    end
+
+    custom_thresholds.each do |threshold|
+      it "sends an email notification after #{threshold} notice(s)" do
+        @err.problem.stub(:notices_count).and_return(threshold)
+        Mailer.should_receive(:err_notification).
+          and_return(mock('email', :deliver => true))
+        Fabricate(:notice, :err => @err)
+      end
+    end
+  end
+
+  describe "email notifications for a resolved issue" do
+
+    before do
+      Errbit::Config.per_app_email_at_notices = true
+      @app = Fabricate(:app_with_watcher, :email_at_notices => [1])
+      @err = Fabricate(:err, :problem => Fabricate(:problem, :app => @app, :notices_count => 100))
+    end
+
+    after do
+      Errbit::Config.per_app_email_at_notices = false
+    end
+
+    it "should send email notification after 1 notice since an error has been resolved" do
+      @err.problem.resolve!
+      Mailer.should_receive(:err_notification).
+        and_return(mock('email', :deliver => true))
+      Fabricate(:notice, :err => @err)
+    end
+  end
+end
diff --git a/spec/models/notice_spec.rb b/spec/models/notice_spec.rb
index 64531b0..dcf7223 100644
--- a/spec/models/notice_spec.rb
+++ b/spec/models/notice_spec.rb
@@ -109,7 +109,5 @@ describe Notice do
       notice = Fabricate.build(:notice, :request => {})
       notice.host.should == 'N/A'
     end
-
   end
-
 end
--
libgit2 0.21.2