diff --git a/ironic_python_agent/ironic_api_client.py b/ironic_python_agent/ironic_api_client.py
index 9a5263e95..972bef714 100644
--- a/ironic_python_agent/ironic_api_client.py
+++ b/ironic_python_agent/ironic_api_client.py
@@ -66,7 +66,7 @@ class APIClient(object):
         except Exception as e:
             raise errors.HeartbeatError(str(e))
 
-        if response.status_code != requests.codes.NO_CONTENT:
+        if response.status_code != requests.codes.ACCEPTED:
             msg = 'Invalid status code: {0}'.format(response.status_code)
             raise errors.HeartbeatError(msg)
 
diff --git a/ironic_python_agent/tests/ironic_api_client.py b/ironic_python_agent/tests/ironic_api_client.py
index b20c4552b..44d17137f 100644
--- a/ironic_python_agent/tests/ironic_api_client.py
+++ b/ironic_python_agent/tests/ironic_api_client.py
@@ -55,7 +55,7 @@ class TestBaseIronicPythonAgent(test_base.BaseTestCase):
 
     def test_successful_heartbeat(self):
         expected_heartbeat_before = time.time() + 120
-        response = FakeResponse(status_code=204, headers={
+        response = FakeResponse(status_code=202, headers={
             'Heartbeat-Before': expected_heartbeat_before,
         })
 
@@ -95,7 +95,7 @@ class TestBaseIronicPythonAgent(test_base.BaseTestCase):
                           advertise_address=('192.0.2.1', '9999'))
 
     def test_heartbeat_missing_heartbeat_before_header(self):
-        response = FakeResponse(status_code=204)
+        response = FakeResponse(status_code=202)
         self.api_client.session.request = mock.Mock()
         self.api_client.session.request.return_value = response
 
@@ -105,7 +105,7 @@ class TestBaseIronicPythonAgent(test_base.BaseTestCase):
                           advertise_address=('192.0.2.1', '9999'))
 
     def test_heartbeat_invalid_heartbeat_before_header(self):
-        response = FakeResponse(status_code=204, headers={
+        response = FakeResponse(status_code=202, headers={
             'Heartbeat-Before': 'tomorrow',
         })
         self.api_client.session.request = mock.Mock()