diff --git a/tests/app/conftest.py b/tests/app/conftest.py
index d111d8d3c..fc50cb623 100644
--- a/tests/app/conftest.py
+++ b/tests/app/conftest.py
@@ -1051,8 +1051,16 @@ def admin_request(client):
                 data=json.dumps(_data),
                 headers=[('Content-Type', 'application/json'), create_authorization_header()]
             )
+<<<<<<< HEAD
             json_resp = json.loads(resp.get_data(as_text=True))
             assert resp.status_code == _expected_status, json_resp
+=======
+            if resp.get_data:
+                json_resp = json.loads(resp.get_data(as_text=True))
+            else:
+                json_resp = None
+            assert resp.status_code == _expected_status
+>>>>>>> Refactor conftest
             return json_resp
 
         @staticmethod