diff --git a/tests/rhtap/rhtap_test.go b/tests/rhtap/rhtap_test.go
index 632c7fd8..37deee96 100644
--- a/tests/rhtap/rhtap_test.go
+++ b/tests/rhtap/rhtap_test.go
@@ -59,6 +59,12 @@ var _ = Describe("RHTAP sample checks", Ordered, Label("nightly"), func() {
 
 			AfterAll(func() {
 				if !CurrentSpecReport().Failed() {
+					if err := fw.HasController.DeleteAllComponentsInASpecificNamespace(testNamespace, 60*time.Second); err != nil {
+						GinkgoWriter.Printf("error deleting all componentns in namespace:\n%s", err)
+					}
+					if err := fw.HasController.DeleteAllApplicationsInASpecificNamespace(testNamespace, 60*time.Second); err != nil {
+						GinkgoWriter.Printf("error deleting all componentns in namespace:\n%s", err)
+					}
 					Expect(fw.CommonController.DeleteNamespace(testNamespace)).NotTo(HaveOccurred())
 				}
 			})