diff --git a/helm-java/src/test/java/com/marcnuri/helm/HelmKubernetesTest.java b/helm-java/src/test/java/com/marcnuri/helm/HelmKubernetesTest.java
index 1896b34..4447f58 100644
--- a/helm-java/src/test/java/com/marcnuri/helm/HelmKubernetesTest.java
+++ b/helm-java/src/test/java/com/marcnuri/helm/HelmKubernetesTest.java
@@ -210,7 +210,8 @@ void withoutSkipCrdsInstallsCrds() {
           .returns("helm-install-with-crds", Release::getName)
           .returns("deployed", Release::getStatus)
           .extracting(Release::getOutput).asString()
-          .contains("installwidgets.helm-java.example.com");
+          .contains("creating 1 resource(s)") // CRD creation
+          .contains("creating 3 resource(s)"); // Rest of the resources
       }
 
       @Test
@@ -225,7 +226,8 @@ void skipCrdsDoesNotInstallCrds() {
           .returns("helm-install-skip-crds", Release::getName)
           .returns("deployed", Release::getStatus)
           .extracting(Release::getOutput).asString()
-          .doesNotContain("installwidgets.helm-java.example.com");
+          .doesNotContain("creating 1 resource(s)") // CRD creation
+          .contains("creating 3 resource(s)"); // Rest of the resources
       }
     }
 
@@ -662,11 +664,11 @@ void setUp() throws IOException {
             "        openAPIV3Schema:\n" +
             "          type: object\n").getBytes(StandardCharsets.UTF_8),
           StandardOpenOption.CREATE);
-        // Install the chart first to have a release to upgrade
-        helmWithCrds.install()
-          .withKubeConfig(kubeConfigFile)
-          .withName("upgrade-crd-release")
-          .call();
+      }
+
+      @AfterEach
+      void tearDown() {
+        Helm.uninstall("upgrade-crd-release").withKubeConfig(kubeConfigFile).call();
       }
 
       @Test
@@ -674,11 +676,15 @@ void withoutSkipCrdsIncludesCrds() {
         final Release result = helmWithCrds.upgrade()
           .withKubeConfig(kubeConfigFile)
           .withName("upgrade-crd-release")
+          .install()// Forces an installation if no prior release exists (including CRDs)
           .debug()
           .call();
         assertThat(result)
-          .returns("2", Release::getRevision)
-          .returns("deployed", Release::getStatus);
+          .returns("1", Release::getRevision)
+          .returns("deployed", Release::getStatus)
+          .extracting(Release::getOutput).asString()
+          .contains("creating 1 resource(s)") // CRD creation
+          .contains("creating 3 resource(s)"); // Rest of the resources
       }
 
       @Test
@@ -686,14 +692,16 @@ void skipCrdsExcludesCrds() {
         final Release result = helmWithCrds.upgrade()
           .withKubeConfig(kubeConfigFile)
           .withName("upgrade-crd-release")
+          .install() // Forces an installation if no prior release exists (including CRDs)
           .skipCrds()
           .debug()
           .call();
         assertThat(result)
-          .returns("2", Release::getRevision)
+          .returns("1", Release::getRevision)
           .returns("deployed", Release::getStatus)
           .extracting(Release::getOutput).asString()
-          .doesNotContain("upgradewidgets.helm-java.example.com");
+          .doesNotContain("creating 1 resource(s)") // CRD creation
+          .contains("creating 3 resource(s)"); // Rest of the resources
       }
     }