diff --git a/Makefile b/Makefile
index d56fa98c..b90a1050 100644
--- a/Makefile
+++ b/Makefile
@@ -53,7 +53,7 @@ docs-serve: ## Preview the documentation
 	$(COMMODORE_CMD)
 
 .PHONY: test
-test: commodore_args = -f tests/$(instance).yml --search-paths ./dependencies
+test: commodore_args = -f tests/$(instance).yml --search-paths ./dependencies --alias $(instance)
 test: .compile ## Compile the component
 
 .PHONY: clean
diff --git a/tests/builtin.yml b/tests/builtin.yml
index 8c261ff7..ed97d539 100644
--- a/tests/builtin.yml
+++ b/tests/builtin.yml
@@ -1,2 +1 @@
-parameters:
-  _instance: builtin
+---
diff --git a/tests/builtin/secrets_test.go b/tests/builtin/secrets_test.go
index 06bef8b6..84270925 100644
--- a/tests/builtin/secrets_test.go
+++ b/tests/builtin/secrets_test.go
@@ -11,7 +11,7 @@ import (
 
 var (
 	expectedDbSecretName = "keycloak-postgresql"
-	testPath             = "../../compiled/keycloak/builtin"
+	testPath             = "../../compiled/builtin/builtin"
 )
 
 func Test_Database_Secret_DefaultParameters(t *testing.T) {
diff --git a/tests/external.yml b/tests/external.yml
index c5249c81..aa03668a 100644
--- a/tests/external.yml
+++ b/tests/external.yml
@@ -1,6 +1,4 @@
 parameters:
-  _instance: external
-
   keycloak:
     database:
       provider: external
diff --git a/tests/external/postgresql_helmchart_not_rendered_test.go b/tests/external/postgresql_helmchart_not_rendered_test.go
new file mode 100644
index 00000000..52155c19
--- /dev/null
+++ b/tests/external/postgresql_helmchart_not_rendered_test.go
@@ -0,0 +1,12 @@
+package external
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/require"
+)
+
+func Test_Postgresql_Helmchart_Not_Rendered(t *testing.T) {
+	subChartDir := testPath+"/01_keycloak_helmchart/keycloak/charts"
+	require.NoDirExists(t, subChartDir)
+}
diff --git a/tests/external/secrets_test.go b/tests/external/secrets_test.go
index fbc1ef0c..cd9e99ba 100644
--- a/tests/external/secrets_test.go
+++ b/tests/external/secrets_test.go
@@ -11,7 +11,7 @@ import (
 
 var (
 	expectedDbSecretName = "keycloak-postgresql"
-	testPath             = "../../compiled/keycloak/external"
+	testPath             = "../../compiled/external/external"
 )
 
 func Test_Database_Secret_DefaultParameters(t *testing.T) {