diff --git a/src/sage/categories/homsets.py b/src/sage/categories/homsets.py
index fd6fb0c85e2..3662c5de78f 100644
--- a/src/sage/categories/homsets.py
+++ b/src/sage/categories/homsets.py
@@ -31,7 +31,7 @@ def category_of(cls, category, *args):
         elif category.full_super_categories():
             return cls.default_super_categories(category, *args)
         else:
-            return HomsetsOf(Category.join(category.super_structure_categories()))
+            return HomsetsOf(Category.join(category.all_structure_super_categories()))
 
     @classmethod
     def default_super_categories(cls, category):
@@ -109,7 +109,7 @@ def _test_homsets_category(self, **options):
         #from sage.categories.objects    import Objects
         #from sage.categories.sets_cat import Sets
         tester = self._tester(**options)
-        tester.assert_(self.is_subcategory(Category.join(self.base_category().super_structure_categories()).Homsets()))
+        tester.assert_(self.is_subcategory(Category.join(self.base_category().all_structure_super_categories()).Homsets()))
 
     @cached_method
     def base(self):