diff --git a/robottelo/cli/repository.py b/robottelo/cli/repository.py
index 342851e68fc..a04000913df 100644
--- a/robottelo/cli/repository.py
+++ b/robottelo/cli/repository.py
@@ -80,6 +80,12 @@ def upload_content(cls, options):
         cls.command_sub = 'upload-content'
         return cls.execute(cls._construct_command(options), output_format='csv', ignore_stderr=True)
 
+    @classmethod
+    def reclaim_space(cls, options):
+        """Remove disk space from a synced repository"""
+        cls.command_sub = 'reclaim-space'
+        return cls.execute(cls._construct_command(options), output_format='csv', ignore_stderr=True)
+
     @classmethod
     def verify_checksum(cls, options):
         """Verify checksum of repository contents."""
diff --git a/tests/foreman/cli/test_repositories.py b/tests/foreman/cli/test_repositories.py
index f7f4fdafdb9..f772794d4dc 100644
--- a/tests/foreman/cli/test_repositories.py
+++ b/tests/foreman/cli/test_repositories.py
@@ -125,3 +125,41 @@ def test_positive_disable_rh_repo_with_basearch(module_target_sat, module_entitl
         }
     )
     assert 'Repository disabled' in disabled_repo[0]['message']
+
+
+def test_reclaim_space_command_no_exception(module_target_sat, module_sca_manifest_org):
+    """Hammer repository reclaim-space should not throw any improper exceptions
+
+    :id: 74b669d8-ee6b-4fc6-864f-91410d7ea3c2
+
+    :steps:
+        1. Enable and sync an On Demand repo
+
+        2. hammer repository reclaim-space --id REPOID --organization-id ORGID
+
+
+    :expectedresults: Command works as expected
+
+    :customerscenario: true
+
+    :BZ: 2164997
+    """
+    rh_repo_id = module_target_sat.api_factory.enable_rhrepo_and_fetchid(
+        basearch=DEFAULT_ARCHITECTURE,
+        org_id=module_sca_manifest_org.id,
+        product=REPOS['kickstart']['rhel8_aps']['product'],
+        repo=REPOS['kickstart']['rhel8_aps']['name'],
+        reposet=REPOS['kickstart']['rhel8_aps']['reposet'],
+        releasever=REPOS['kickstart']['rhel8_aps']['version'],
+    )
+    repo = module_target_sat.api.Repository(id=rh_repo_id).read()
+    repo.sync(timeout=600)
+    output = module_target_sat.cli.Repository.reclaim_space(
+        {
+            'organization-id': module_sca_manifest_org.id,
+            'id': rh_repo_id,
+        }
+    )
+    # Checking that the fail message isn't present. On a success, no message is returned
+    if output != {}:
+        assert 'Could not reclaim the repository' not in output[0]['message']