diff --git a/master/custom/steps.py b/master/custom/steps.py
index f28f7fdd..bc50f547 100644
--- a/master/custom/steps.py
+++ b/master/custom/steps.py
@@ -25,6 +25,18 @@ class GitHub(_GitHub):
     warnOnFailure = True
 
 
+class GitGC(ShellCommand):
+    name = 'git-gc'
+    warnOnFailure = True
+    haltOnFailure = False
+    flunkOnFailure = False
+    alwaysRun = True
+
+    description = ["cleaning git checkout"]
+    descriptionDone = ["git garbage collected"]
+    command = ["git", "gc"]
+
+
 class Test(BaseTest):
     # Regular expression used to catch warnings, errors and bugs
     warningPattern = (
@@ -144,14 +156,6 @@ class Clean(ShellCommand):
     alwaysRun = True
 
 
-class CleanupTest(ShellCommand):
-    name = "cleantest"
-    description = ["cleaning previous tests"]
-    descriptionDone = ["clean previous tests"]
-    flunkOnFailure = False
-    warnOnFailure = True
-
-
 class Install(ShellCommand):
     name = "install"
     description = ["installing"]
diff --git a/master/master.cfg b/master/master.cfg
index fb9bc5c5..072520ae 100644
--- a/master/master.cfg
+++ b/master/master.cfg
@@ -41,7 +41,7 @@ from custom.pr_testing import (  # noqa: E402
     should_pr_be_tested,
 )
 from custom.settings import Settings  # noqa: E402
-from custom.steps import Git, GitHub  # noqa: E402
+from custom.steps import GitGC, GitHub  # noqa: E402
 from custom.workers import get_workers  # noqa: E402
 from custom.schedulers import GitHubPrScheduler # noqa: E402
 from custom.release_dashboard import get_release_status_app    # noqa: E402
@@ -226,6 +226,9 @@ for branch in BRANCHES:
         if branch not in f.branches:
             continue
 
+        # Stopgap space saver until blobless clones are fixed (buildbot 4.4+)
+        f.addStep(GitGC())
+
         tags = [branch.builder_tag, *builder_def.tags, *f.tags]
 
         if 'nogil' in tags and branch.gil_only: