diff --git a/app/models/integrations/datadog.rb b/app/models/integrations/datadog.rb
index 8a356cf8abc0aa392d9897a695ab7edb9da639bc..08cd451db94e475980e9e45cf344ece59cc4e65e 100644
--- a/app/models/integrations/datadog.rb
+++ b/app/models/integrations/datadog.rb
@@ -129,14 +129,12 @@ def execute(data)
     end
 
     def test(data)
-      begin
-        result = execute(data)
-        return { success: false, result: result[:message] } if result[:http_status] != 200
-      rescue StandardError => error
-        return { success: false, result: error }
-      end
-
-      { success: true, result: result[:message] }
+      result = execute(data)
+
+      {
+        success: (200..299).cover?(result[:http_status]),
+        result: result[:message]
+      }
     end
 
     private
diff --git a/spec/models/integrations/datadog_spec.rb b/spec/models/integrations/datadog_spec.rb
index 0920302e386575a6daefe29ef7a39aca10a80933..677bd4c5e48a8c0a63d95c76ed2abbd74149303a 100644
--- a/spec/models/integrations/datadog_spec.rb
+++ b/spec/models/integrations/datadog_spec.rb
@@ -140,21 +140,29 @@
   end
 
   describe '#test' do
-    context 'when request is succesful' do
-      subject { saved_instance.test(pipeline_data) }
+    subject(:result) { saved_instance.test(pipeline_data) }
 
-      before do
-        stub_request(:post, expected_hook_url).to_return(body: 'OK')
-      end
+    let(:body) { 'OK' }
+    let(:status) { 200 }
+
+    before do
+      stub_request(:post, expected_hook_url).to_return(body: body, status: status)
+    end
+
+    context 'when request is successful with a HTTP 200 status' do
       it { is_expected.to eq({ success: true, result: 'OK' }) }
     end
 
-    context 'when request fails' do
-      subject { saved_instance.test(pipeline_data) }
+    context 'when request is successful with a HTTP 202 status' do
+      let(:status) { 202 }
+
+      it { is_expected.to eq({ success: true, result: 'OK' }) }
+    end
+
+    context 'when request fails with a HTTP 500 status' do
+      let(:status) { 500 }
+      let(:body) { 'CRASH!!!' }
 
-      before do
-        stub_request(:post, expected_hook_url).to_return(body: 'CRASH!!!', status: 500)
-      end
       it { is_expected.to eq({ success: false, result: 'CRASH!!!' }) }
     end
   end