diff --git a/test/integration/component/test_accounts.py b/test/integration/component/test_accounts.py
index 3c284bd0fcd..92f7a6fa8b9 100644
--- a/test/integration/component/test_accounts.py
+++ b/test/integration/component/test_accounts.py
@@ -876,10 +876,17 @@ class TestTemplateHierarchy(cloudstackTestCase):
                                             account=cls.account_1.name,
                                             domainid=cls.domain_1.id
                                         )
+
+        # Wait for template to download
+        cls.template.download(cls.api_client)
+
+        # Wait for template status to be changed across
+        time.sleep(60)
+
         cls._cleanup = [
                         cls.account_2,
                         cls.domain_2,
-           cls.template,
+                        cls.template,
                         cls.account_1,
                         cls.domain_1,
                         ]
@@ -945,7 +952,8 @@ class TestTemplateHierarchy(cloudstackTestCase):
         # Verify private service offering is not visible to other domain
         templates = list_templates(
                                     self.apiclient,
-                                    templatefilter='self',
+                                    id=self.template.id,
+                                    templatefilter='all',
                                     account=self.account_2.name,
                                     domainid=self.domain_2.id
                                 )