diff --git a/tests/unit/admin/views/test_organizations.py b/tests/unit/admin/views/test_organizations.py
index b74a38cd5a82..921aeb292ad6 100644
--- a/tests/unit/admin/views/test_organizations.py
+++ b/tests/unit/admin/views/test_organizations.py
@@ -557,7 +557,7 @@ def test_rename(self, db_request):
 
         db_request.matchdict = {"organization_id": organization.id}
         db_request.params = {
-            "new_organization_name": "widget",
+            "new_organization_name": "  widget  ",  # Test trimming whitespace
         }
         db_request.user = admin
         db_request.route_path = pretend.call_recorder(_organization_application_routes)
diff --git a/warehouse/admin/views/organizations.py b/warehouse/admin/views/organizations.py
index 46b27997d37e..bfa761f4cdc0 100644
--- a/warehouse/admin/views/organizations.py
+++ b/warehouse/admin/views/organizations.py
@@ -313,7 +313,7 @@ def organization_rename(request):
         raise HTTPNotFound
 
     old_organization_name = organization.name
-    new_organization_name = request.params.get("new_organization_name")
+    new_organization_name = request.params.get("new_organization_name").strip()
 
     try:
         organization_service.rename_organization(organization_id, new_organization_name)