diff --git a/spec/controllers/webhooks_controller_spec.rb b/spec/requests/webhooks_controller_spec.rb
similarity index 81%
rename from spec/controllers/webhooks_controller_spec.rb
rename to spec/requests/webhooks_controller_spec.rb
index cfd8c6f9de5..e0ed4db5cf1 100644
--- a/spec/controllers/webhooks_controller_spec.rb
+++ b/spec/requests/webhooks_controller_spec.rb
@@ -7,22 +7,25 @@ describe WebhooksController do
   let(:message_id) { "12345@il.com" }
 
   context "mailgun" do
-
     it "works" do
       SiteSetting.mailgun_api_key = "key-8221462f0c915af3f6f2e2df7aa5a493"
 
       user = Fabricate(:user, email: email)
       email_log = Fabricate(:email_log, user: user, message_id: message_id, to_address: email)
 
-      WebhooksController.any_instance.expects(:mailgun_verify).returns(true)
+      token = "705a8ccd2ce932be8e98c221fe701c1b4a0afcb8bbd57726de"
+      timestamp = Time.now.to_i
+      data = "#{timestamp}#{token}"
+      signature = OpenSSL::HMAC.hexdigest(OpenSSL::Digest::SHA256.new, SiteSetting.mailgun_api_key, data)
 
-      post :mailgun, params: {
-        "token" => "705a8ccd2ce932be8e98c221fe701c1b4a0afcb8bbd57726de",
-        "timestamp" => Time.now.to_i,
+      post "/webhooks/mailgun.json", params: {
+        "token" => token,
+        "timestamp" => timestamp,
         "event" => "dropped",
         "recipient" => email,
-        "Message-Id" => "<12345@il.com>"
-      }, format: :json
+        "Message-Id" => "<12345@il.com>",
+        "signature" => signature
+      }
 
       expect(response).to be_successful
 
@@ -30,16 +33,14 @@ describe WebhooksController do
       expect(email_log.bounced).to eq(true)
       expect(email_log.user.user_stat.bounce_score).to eq(2)
     end
-
   end
 
   context "sendgrid" do
-
     it "works" do
       user = Fabricate(:user, email: email)
       email_log = Fabricate(:email_log, user: user, message_id: message_id, to_address: email)
 
-      post :sendgrid, params: {
+      post "/webhooks/sendgrid.json", params: {
         "_json" => [
           {
             "email"   => email,
@@ -48,7 +49,7 @@ describe WebhooksController do
             "status"  => "5.0.0"
           }
         ]
-      }, format: :json
+      }
 
       expect(response).to be_successful
 
@@ -56,21 +57,19 @@ describe WebhooksController do
       expect(email_log.bounced).to eq(true)
       expect(email_log.user.user_stat.bounce_score).to eq(2)
     end
-
   end
 
   context "mailjet" do
-
     it "works" do
       user = Fabricate(:user, email: email)
       email_log = Fabricate(:email_log, user: user, message_id: message_id, to_address: email)
 
-      post :mailjet, params: {
+      post "/webhooks/mailjet.json", params: {
         "event" => "bounce",
         "email"       => email,
         "hard_bounce" => true,
         "CustomID"    => message_id
-      }, format: :json
+      }
 
       expect(response).to be_successful
 
@@ -78,16 +77,14 @@ describe WebhooksController do
       expect(email_log.bounced).to eq(true)
       expect(email_log.user.user_stat.bounce_score).to eq(2)
     end
-
   end
 
   context "mandrill" do
-
     it "works" do
       user = Fabricate(:user, email: email)
       email_log = Fabricate(:email_log, user: user, message_id: message_id, to_address: email)
 
-      post :mandrill, params: {
+      post "/webhooks/mandrill.json", params: {
         mandrill_events: [{
           "event" => "hard_bounce",
           "msg" => {
@@ -97,7 +94,7 @@ describe WebhooksController do
             }
           }
         }]
-      }, format: :json
+      }
 
       expect(response).to be_successful
 
@@ -105,16 +102,14 @@ describe WebhooksController do
       expect(email_log.bounced).to eq(true)
       expect(email_log.user.user_stat.bounce_score).to eq(2)
     end
-
   end
 
   context "sparkpost" do
-
     it "works" do
       user = Fabricate(:user, email: email)
       email_log = Fabricate(:email_log, user: user, message_id: message_id, to_address: email)
 
-      post :sparkpost, params: {
+      post "/webhooks/sparkpost.json", params: {
         "_json" => [{
           "msys" => {
             "message_event" => {
@@ -126,7 +121,7 @@ describe WebhooksController do
             }
           }
         }]
-      }, format: :json
+      }
 
       expect(response).to be_successful
 
@@ -134,7 +129,5 @@ describe WebhooksController do
       expect(email_log.bounced).to eq(true)
       expect(email_log.user.user_stat.bounce_score).to eq(2)
     end
-
   end
-
 end