diff --git a/readthedocs/rtd_tests/tests/test_project.py b/readthedocs/rtd_tests/tests/test_project.py
index a04b14c8b94..998b1575f9d 100644
--- a/readthedocs/rtd_tests/tests/test_project.py
+++ b/readthedocs/rtd_tests/tests/test_project.py
@@ -577,62 +577,3 @@ def test_user_can_change_project_with_same_lang(self):
         )
         self.assertEqual(resp.status_code, 200)
         self.assertNotContains(resp, "There is already a")
-
-
-class TestFinishInactiveBuildsTask(TestCase):
-    fixtures = ["eric", "test_data"]
-
-    def setUp(self):
-        self.client.login(username="eric", password="test")
-        self.pip = Project.objects.get(slug="pip")
-
-        self.taggit = Project.objects.get(slug="taggit")
-        self.taggit.container_time_limit = 7200  # 2 hours
-        self.taggit.save()
-
-        # Build just started with the default time
-        self.build_1 = Build.objects.create(
-            project=self.pip,
-            version=self.pip.get_stable_version(),
-            state=BUILD_STATE_CLONING,
-        )
-
-        # Build started an hour ago with default time
-        self.build_2 = Build.objects.create(
-            project=self.pip,
-            version=self.pip.get_stable_version(),
-            state=BUILD_STATE_TRIGGERED,
-        )
-        self.build_2.date = timezone.now() - datetime.timedelta(hours=1)
-        self.build_2.save()
-
-        # Build started an hour ago with custom time (2 hours)
-        self.build_3 = Build.objects.create(
-            project=self.taggit,
-            version=self.taggit.get_stable_version(),
-            state=BUILD_STATE_TRIGGERED,
-        )
-        self.build_3.date = timezone.now() - datetime.timedelta(hours=1)
-        self.build_3.save()
-
-    @pytest.mark.xfail(reason="Fails while we work out Docker time limits", strict=True)
-    def test_finish_inactive_builds_task(self):
-        finish_inactive_builds()
-
-        # Legitimate build (just started) not finished
-        self.build_1.refresh_from_db()
-        self.assertTrue(self.build_1.success)
-        self.assertEqual(self.build_1.error, "")
-        self.assertEqual(self.build_1.state, BUILD_STATE_CLONING)
-
-        # Build with default time finished
-        self.build_2.refresh_from_db()
-        self.assertFalse(self.build_2.success)
-        self.assertNotEqual(self.build_2.error, "")
-        self.assertEqual(self.build_2.state, BUILD_STATE_FINISHED)
-
-        # Build with custom time not finished
-        self.build_3.refresh_from_db()
-        self.assertTrue(self.build_3.success)
-        self.assertEqual(self.build_3.error, "")
-        self.assertEqual(self.build_3.state, BUILD_STATE_TRIGGERED)
diff --git a/readthedocs/rtd_tests/tests/test_projects_tasks.py b/readthedocs/rtd_tests/tests/test_projects_tasks.py
index 5beec0d5bf4..a21b2030426 100644
--- a/readthedocs/rtd_tests/tests/test_projects_tasks.py
+++ b/readthedocs/rtd_tests/tests/test_projects_tasks.py
@@ -1,12 +1,21 @@
+import datetime
+
 from unittest.mock import patch
 
 from django.test import TestCase
+from django.utils import timezone
 from django_dynamic_fixture import get
 
-from readthedocs.builds.constants import BUILD_STATUS_SUCCESS, EXTERNAL
+from readthedocs.builds.constants import (
+    BUILD_STATUS_SUCCESS,
+    BUILD_STATE_CLONING,
+    BUILD_STATE_CANCELLED,
+    BUILD_STATE_TRIGGERED,
+    EXTERNAL,
+)
 from readthedocs.builds.models import Build, Version
-from readthedocs.projects.models import Project
-from readthedocs.projects.tasks.utils import send_external_build_status
+from readthedocs.projects.models import Feature, Project
+from readthedocs.projects.tasks.utils import finish_unhealthy_builds, send_external_build_status
 
 
 class SendBuildStatusTests(TestCase):
@@ -46,3 +55,53 @@ def test_send_external_build_status_with_internal_version(self, send_build_statu
         )
 
         send_build_status.delay.assert_not_called()
+
+class TestFinishInactiveBuildsTask(TestCase):
+
+    @patch("readthedocs.projects.tasks.utils.app")
+    def test_finish_unhealthy_builds_task(self, mocked_app):
+        project = get(Project)
+        feature = get(Feature, feature_id=Feature.BUILD_HEALTHCHECK)
+        feature.projects.add(project)
+
+        # Build just started with the default time and healthcheck now
+        build_1 = get(
+            Build,
+            project=project,
+            version=project.get_stable_version(),
+            state=BUILD_STATE_CLONING,
+            healthcheck=timezone.now(),
+        )
+
+        # Build started an hour ago with default time and healthcheck 59s ago
+        build_2 = get(
+            Build,
+            project=project,
+            version=project.get_stable_version(),
+            state=BUILD_STATE_TRIGGERED,
+            date=timezone.now() - datetime.timedelta(hours=1),
+            healthcheck=timezone.now() - datetime.timedelta(seconds=59),
+        )
+
+        # Build started an hour ago with custom time (2 hours) and healthcheck 15m ago
+        build_3 = get(
+            Build,
+            project=project,
+            version=project.get_stable_version(),
+            state=BUILD_STATE_TRIGGERED,
+            date=timezone.now() - datetime.timedelta(hours=2),
+            healthcheck=timezone.now() - datetime.timedelta(minutes=15),
+        )
+
+        finish_unhealthy_builds()
+
+        build_1.refresh_from_db()
+        self.assertEqual(build_1.state, BUILD_STATE_CLONING)
+
+        build_2.refresh_from_db()
+        self.assertEqual(build_2.state, BUILD_STATE_TRIGGERED)
+
+        build_3.refresh_from_db()
+        self.assertEqual(build_3.state, BUILD_STATE_CANCELLED)
+        self.assertEqual(build_3.success, False)
+        self.assertEqual(build_3.notifications.count(), 1)