diff --git a/7.3/test/test_deploy_templates.py b/7.3/test/test_deploy_templates.py
deleted file mode 120000
index 2b15b63f4..000000000
--- a/7.3/test/test_deploy_templates.py
+++ /dev/null
@@ -1 +0,0 @@
-../../test/test_deploy_templates.py
\ No newline at end of file
diff --git a/7.3/test/test_latest_imagestreams.py b/7.3/test/test_latest_imagestreams.py
deleted file mode 120000
index 7c2583ef5..000000000
--- a/7.3/test/test_latest_imagestreams.py
+++ /dev/null
@@ -1 +0,0 @@
-../../test/test_latest_imagestreams.py
\ No newline at end of file
diff --git a/7.3/test/test_php_deploy_templates.py b/7.3/test/test_php_deploy_templates.py
new file mode 120000
index 000000000..092efcb71
--- /dev/null
+++ b/7.3/test/test_php_deploy_templates.py
@@ -0,0 +1 @@
+../../test/test_php_deploy_templates.py
\ No newline at end of file
diff --git a/7.3/test/test_php_latest_imagestreams.py b/7.3/test/test_php_latest_imagestreams.py
new file mode 120000
index 000000000..b4384d6a0
--- /dev/null
+++ b/7.3/test/test_php_latest_imagestreams.py
@@ -0,0 +1 @@
+../../test/test_php_latest_imagestreams.py
\ No newline at end of file
diff --git a/7.3/test/test_php_s2i_imagestreams.py b/7.3/test/test_php_s2i_imagestreams.py
new file mode 120000
index 000000000..acb01691f
--- /dev/null
+++ b/7.3/test/test_php_s2i_imagestreams.py
@@ -0,0 +1 @@
+../../test/test_php_s2i_imagestreams.py
\ No newline at end of file
diff --git a/7.3/test/test_php_s2i_integration.py b/7.3/test/test_php_s2i_integration.py
new file mode 120000
index 000000000..68fa032e0
--- /dev/null
+++ b/7.3/test/test_php_s2i_integration.py
@@ -0,0 +1 @@
+../../test/test_php_s2i_integration.py
\ No newline at end of file
diff --git a/7.3/test/test_s2i_imagestreams.py b/7.3/test/test_s2i_imagestreams.py
deleted file mode 120000
index 00c872cba..000000000
--- a/7.3/test/test_s2i_imagestreams.py
+++ /dev/null
@@ -1 +0,0 @@
-../../test/test_s2i_imagestreams.py
\ No newline at end of file
diff --git a/7.3/test/test_s2i_integration.py b/7.3/test/test_s2i_integration.py
deleted file mode 120000
index c7827e840..000000000
--- a/7.3/test/test_s2i_integration.py
+++ /dev/null
@@ -1 +0,0 @@
-../../test/test_s2i_integration.py
\ No newline at end of file
diff --git a/7.4/test/test_deploy_templates.py b/7.4/test/test_deploy_templates.py
deleted file mode 120000
index 2b15b63f4..000000000
--- a/7.4/test/test_deploy_templates.py
+++ /dev/null
@@ -1 +0,0 @@
-../../test/test_deploy_templates.py
\ No newline at end of file
diff --git a/7.4/test/test_helm_cakephp_application.py b/7.4/test/test_helm_cakephp_application.py
deleted file mode 120000
index 8f9bd862c..000000000
--- a/7.4/test/test_helm_cakephp_application.py
+++ /dev/null
@@ -1 +0,0 @@
-../../test/test_helm_cakephp_application.py
\ No newline at end of file
diff --git a/7.4/test/test_helm_chart_imagestreams.py b/7.4/test/test_helm_chart_imagestreams.py
deleted file mode 120000
index c8627f9b5..000000000
--- a/7.4/test/test_helm_chart_imagestreams.py
+++ /dev/null
@@ -1 +0,0 @@
-../../test/test_helm_chart_imagestreams.py
\ No newline at end of file
diff --git a/7.4/test/test_latest_imagestreams.py b/7.4/test/test_latest_imagestreams.py
deleted file mode 120000
index 7c2583ef5..000000000
--- a/7.4/test/test_latest_imagestreams.py
+++ /dev/null
@@ -1 +0,0 @@
-../../test/test_latest_imagestreams.py
\ No newline at end of file
diff --git a/7.4/test/test_php_deploy_templates.py b/7.4/test/test_php_deploy_templates.py
new file mode 120000
index 000000000..092efcb71
--- /dev/null
+++ b/7.4/test/test_php_deploy_templates.py
@@ -0,0 +1 @@
+../../test/test_php_deploy_templates.py
\ No newline at end of file
diff --git a/7.4/test/test_php_latest_imagestreams.py b/7.4/test/test_php_latest_imagestreams.py
new file mode 120000
index 000000000..b4384d6a0
--- /dev/null
+++ b/7.4/test/test_php_latest_imagestreams.py
@@ -0,0 +1 @@
+../../test/test_php_latest_imagestreams.py
\ No newline at end of file
diff --git a/7.4/test/test_php_s2i_imagestreams.py b/7.4/test/test_php_s2i_imagestreams.py
new file mode 120000
index 000000000..acb01691f
--- /dev/null
+++ b/7.4/test/test_php_s2i_imagestreams.py
@@ -0,0 +1 @@
+../../test/test_php_s2i_imagestreams.py
\ No newline at end of file
diff --git a/7.4/test/test_php_s2i_integration.py b/7.4/test/test_php_s2i_integration.py
new file mode 120000
index 000000000..68fa032e0
--- /dev/null
+++ b/7.4/test/test_php_s2i_integration.py
@@ -0,0 +1 @@
+../../test/test_php_s2i_integration.py
\ No newline at end of file
diff --git a/7.4/test/test_s2i_imagestreams.py b/7.4/test/test_s2i_imagestreams.py
deleted file mode 120000
index 00c872cba..000000000
--- a/7.4/test/test_s2i_imagestreams.py
+++ /dev/null
@@ -1 +0,0 @@
-../../test/test_s2i_imagestreams.py
\ No newline at end of file
diff --git a/7.4/test/test_s2i_integration.py b/7.4/test/test_s2i_integration.py
deleted file mode 120000
index c7827e840..000000000
--- a/7.4/test/test_s2i_integration.py
+++ /dev/null
@@ -1 +0,0 @@
-../../test/test_s2i_integration.py
\ No newline at end of file
diff --git a/7.4/test/test_shared_helm_cakephp_application.py b/7.4/test/test_shared_helm_cakephp_application.py
new file mode 120000
index 000000000..dd36f6162
--- /dev/null
+++ b/7.4/test/test_shared_helm_cakephp_application.py
@@ -0,0 +1 @@
+../../test/test_shared_helm_cakephp_application.py
\ No newline at end of file
diff --git a/7.4/test/test_shared_helm_chart_imagestreams.py b/7.4/test/test_shared_helm_chart_imagestreams.py
new file mode 120000
index 000000000..58132e862
--- /dev/null
+++ b/7.4/test/test_shared_helm_chart_imagestreams.py
@@ -0,0 +1 @@
+../../test/test_shared_helm_chart_imagestreams.py
\ No newline at end of file
diff --git a/8.0/test/test_deploy_templates.py b/8.0/test/test_deploy_templates.py
deleted file mode 120000
index 2b15b63f4..000000000
--- a/8.0/test/test_deploy_templates.py
+++ /dev/null
@@ -1 +0,0 @@
-../../test/test_deploy_templates.py
\ No newline at end of file
diff --git a/8.0/test/test_helm_cakephp_application.py b/8.0/test/test_helm_cakephp_application.py
deleted file mode 120000
index 8f9bd862c..000000000
--- a/8.0/test/test_helm_cakephp_application.py
+++ /dev/null
@@ -1 +0,0 @@
-../../test/test_helm_cakephp_application.py
\ No newline at end of file
diff --git a/8.0/test/test_helm_chart_imagestreams.py b/8.0/test/test_helm_chart_imagestreams.py
deleted file mode 120000
index c8627f9b5..000000000
--- a/8.0/test/test_helm_chart_imagestreams.py
+++ /dev/null
@@ -1 +0,0 @@
-../../test/test_helm_chart_imagestreams.py
\ No newline at end of file
diff --git a/8.0/test/test_latest_imagestreams.py b/8.0/test/test_latest_imagestreams.py
deleted file mode 120000
index 7c2583ef5..000000000
--- a/8.0/test/test_latest_imagestreams.py
+++ /dev/null
@@ -1 +0,0 @@
-../../test/test_latest_imagestreams.py
\ No newline at end of file
diff --git a/8.0/test/test_php_deploy_templates.py b/8.0/test/test_php_deploy_templates.py
new file mode 120000
index 000000000..092efcb71
--- /dev/null
+++ b/8.0/test/test_php_deploy_templates.py
@@ -0,0 +1 @@
+../../test/test_php_deploy_templates.py
\ No newline at end of file
diff --git a/8.0/test/test_php_latest_imagestreams.py b/8.0/test/test_php_latest_imagestreams.py
new file mode 120000
index 000000000..b4384d6a0
--- /dev/null
+++ b/8.0/test/test_php_latest_imagestreams.py
@@ -0,0 +1 @@
+../../test/test_php_latest_imagestreams.py
\ No newline at end of file
diff --git a/8.0/test/test_php_s2i_imagestreams.py b/8.0/test/test_php_s2i_imagestreams.py
new file mode 120000
index 000000000..acb01691f
--- /dev/null
+++ b/8.0/test/test_php_s2i_imagestreams.py
@@ -0,0 +1 @@
+../../test/test_php_s2i_imagestreams.py
\ No newline at end of file
diff --git a/8.0/test/test_php_s2i_integration.py b/8.0/test/test_php_s2i_integration.py
new file mode 120000
index 000000000..68fa032e0
--- /dev/null
+++ b/8.0/test/test_php_s2i_integration.py
@@ -0,0 +1 @@
+../../test/test_php_s2i_integration.py
\ No newline at end of file
diff --git a/8.0/test/test_s2i_imagestreams.py b/8.0/test/test_s2i_imagestreams.py
deleted file mode 120000
index 00c872cba..000000000
--- a/8.0/test/test_s2i_imagestreams.py
+++ /dev/null
@@ -1 +0,0 @@
-../../test/test_s2i_imagestreams.py
\ No newline at end of file
diff --git a/8.0/test/test_s2i_integration.py b/8.0/test/test_s2i_integration.py
deleted file mode 120000
index c7827e840..000000000
--- a/8.0/test/test_s2i_integration.py
+++ /dev/null
@@ -1 +0,0 @@
-../../test/test_s2i_integration.py
\ No newline at end of file
diff --git a/8.0/test/test_shared_helm_cakephp_application.py b/8.0/test/test_shared_helm_cakephp_application.py
new file mode 120000
index 000000000..dd36f6162
--- /dev/null
+++ b/8.0/test/test_shared_helm_cakephp_application.py
@@ -0,0 +1 @@
+../../test/test_shared_helm_cakephp_application.py
\ No newline at end of file
diff --git a/8.0/test/test_shared_helm_chart_imagestreams.py b/8.0/test/test_shared_helm_chart_imagestreams.py
new file mode 120000
index 000000000..58132e862
--- /dev/null
+++ b/8.0/test/test_shared_helm_chart_imagestreams.py
@@ -0,0 +1 @@
+../../test/test_shared_helm_chart_imagestreams.py
\ No newline at end of file
diff --git a/8.1/test/test_deploy_templates.py b/8.1/test/test_deploy_templates.py
deleted file mode 120000
index 2b15b63f4..000000000
--- a/8.1/test/test_deploy_templates.py
+++ /dev/null
@@ -1 +0,0 @@
-../../test/test_deploy_templates.py
\ No newline at end of file
diff --git a/8.1/test/test_helm_cakephp_application.py b/8.1/test/test_helm_cakephp_application.py
deleted file mode 120000
index 8f9bd862c..000000000
--- a/8.1/test/test_helm_cakephp_application.py
+++ /dev/null
@@ -1 +0,0 @@
-../../test/test_helm_cakephp_application.py
\ No newline at end of file
diff --git a/8.1/test/test_helm_chart_imagestreams.py b/8.1/test/test_helm_chart_imagestreams.py
deleted file mode 120000
index c8627f9b5..000000000
--- a/8.1/test/test_helm_chart_imagestreams.py
+++ /dev/null
@@ -1 +0,0 @@
-../../test/test_helm_chart_imagestreams.py
\ No newline at end of file
diff --git a/8.1/test/test_latest_imagestreams.py b/8.1/test/test_latest_imagestreams.py
deleted file mode 120000
index 7c2583ef5..000000000
--- a/8.1/test/test_latest_imagestreams.py
+++ /dev/null
@@ -1 +0,0 @@
-../../test/test_latest_imagestreams.py
\ No newline at end of file
diff --git a/8.1/test/test_php_deploy_templates.py b/8.1/test/test_php_deploy_templates.py
new file mode 120000
index 000000000..092efcb71
--- /dev/null
+++ b/8.1/test/test_php_deploy_templates.py
@@ -0,0 +1 @@
+../../test/test_php_deploy_templates.py
\ No newline at end of file
diff --git a/8.1/test/test_php_latest_imagestreams.py b/8.1/test/test_php_latest_imagestreams.py
new file mode 120000
index 000000000..b4384d6a0
--- /dev/null
+++ b/8.1/test/test_php_latest_imagestreams.py
@@ -0,0 +1 @@
+../../test/test_php_latest_imagestreams.py
\ No newline at end of file
diff --git a/8.1/test/test_php_s2i_imagestreams.py b/8.1/test/test_php_s2i_imagestreams.py
new file mode 120000
index 000000000..acb01691f
--- /dev/null
+++ b/8.1/test/test_php_s2i_imagestreams.py
@@ -0,0 +1 @@
+../../test/test_php_s2i_imagestreams.py
\ No newline at end of file
diff --git a/8.1/test/test_php_s2i_integration.py b/8.1/test/test_php_s2i_integration.py
new file mode 120000
index 000000000..68fa032e0
--- /dev/null
+++ b/8.1/test/test_php_s2i_integration.py
@@ -0,0 +1 @@
+../../test/test_php_s2i_integration.py
\ No newline at end of file
diff --git a/8.1/test/test_s2i_imagestreams.py b/8.1/test/test_s2i_imagestreams.py
deleted file mode 120000
index 00c872cba..000000000
--- a/8.1/test/test_s2i_imagestreams.py
+++ /dev/null
@@ -1 +0,0 @@
-../../test/test_s2i_imagestreams.py
\ No newline at end of file
diff --git a/8.1/test/test_s2i_integration.py b/8.1/test/test_s2i_integration.py
deleted file mode 120000
index c7827e840..000000000
--- a/8.1/test/test_s2i_integration.py
+++ /dev/null
@@ -1 +0,0 @@
-../../test/test_s2i_integration.py
\ No newline at end of file
diff --git a/8.1/test/test_shared_helm_cakephp_application.py b/8.1/test/test_shared_helm_cakephp_application.py
new file mode 120000
index 000000000..dd36f6162
--- /dev/null
+++ b/8.1/test/test_shared_helm_cakephp_application.py
@@ -0,0 +1 @@
+../../test/test_shared_helm_cakephp_application.py
\ No newline at end of file
diff --git a/8.1/test/test_shared_helm_chart_imagestreams.py b/8.1/test/test_shared_helm_chart_imagestreams.py
new file mode 120000
index 000000000..58132e862
--- /dev/null
+++ b/8.1/test/test_shared_helm_chart_imagestreams.py
@@ -0,0 +1 @@
+../../test/test_shared_helm_chart_imagestreams.py
\ No newline at end of file
diff --git a/8.2/test/test_deploy_templates.py b/8.2/test/test_deploy_templates.py
deleted file mode 120000
index 2b15b63f4..000000000
--- a/8.2/test/test_deploy_templates.py
+++ /dev/null
@@ -1 +0,0 @@
-../../test/test_deploy_templates.py
\ No newline at end of file
diff --git a/8.2/test/test_helm_cakephp_application.py b/8.2/test/test_helm_cakephp_application.py
deleted file mode 120000
index 8f9bd862c..000000000
--- a/8.2/test/test_helm_cakephp_application.py
+++ /dev/null
@@ -1 +0,0 @@
-../../test/test_helm_cakephp_application.py
\ No newline at end of file
diff --git a/8.2/test/test_helm_chart_imagestreams.py b/8.2/test/test_helm_chart_imagestreams.py
deleted file mode 120000
index c8627f9b5..000000000
--- a/8.2/test/test_helm_chart_imagestreams.py
+++ /dev/null
@@ -1 +0,0 @@
-../../test/test_helm_chart_imagestreams.py
\ No newline at end of file
diff --git a/8.2/test/test_latest_imagestreams.py b/8.2/test/test_latest_imagestreams.py
deleted file mode 120000
index 7c2583ef5..000000000
--- a/8.2/test/test_latest_imagestreams.py
+++ /dev/null
@@ -1 +0,0 @@
-../../test/test_latest_imagestreams.py
\ No newline at end of file
diff --git a/8.2/test/test_php_deploy_templates.py b/8.2/test/test_php_deploy_templates.py
new file mode 120000
index 000000000..092efcb71
--- /dev/null
+++ b/8.2/test/test_php_deploy_templates.py
@@ -0,0 +1 @@
+../../test/test_php_deploy_templates.py
\ No newline at end of file
diff --git a/8.2/test/test_php_latest_imagestreams.py b/8.2/test/test_php_latest_imagestreams.py
new file mode 120000
index 000000000..b4384d6a0
--- /dev/null
+++ b/8.2/test/test_php_latest_imagestreams.py
@@ -0,0 +1 @@
+../../test/test_php_latest_imagestreams.py
\ No newline at end of file
diff --git a/8.2/test/test_php_s2i_imagestreams.py b/8.2/test/test_php_s2i_imagestreams.py
new file mode 120000
index 000000000..acb01691f
--- /dev/null
+++ b/8.2/test/test_php_s2i_imagestreams.py
@@ -0,0 +1 @@
+../../test/test_php_s2i_imagestreams.py
\ No newline at end of file
diff --git a/8.2/test/test_php_s2i_integration.py b/8.2/test/test_php_s2i_integration.py
new file mode 120000
index 000000000..68fa032e0
--- /dev/null
+++ b/8.2/test/test_php_s2i_integration.py
@@ -0,0 +1 @@
+../../test/test_php_s2i_integration.py
\ No newline at end of file
diff --git a/8.2/test/test_s2i_imagestreams.py b/8.2/test/test_s2i_imagestreams.py
deleted file mode 120000
index 00c872cba..000000000
--- a/8.2/test/test_s2i_imagestreams.py
+++ /dev/null
@@ -1 +0,0 @@
-../../test/test_s2i_imagestreams.py
\ No newline at end of file
diff --git a/8.2/test/test_s2i_integration.py b/8.2/test/test_s2i_integration.py
deleted file mode 120000
index c7827e840..000000000
--- a/8.2/test/test_s2i_integration.py
+++ /dev/null
@@ -1 +0,0 @@
-../../test/test_s2i_integration.py
\ No newline at end of file
diff --git a/8.2/test/test_shared_helm_cakephp_application.py b/8.2/test/test_shared_helm_cakephp_application.py
new file mode 120000
index 000000000..dd36f6162
--- /dev/null
+++ b/8.2/test/test_shared_helm_cakephp_application.py
@@ -0,0 +1 @@
+../../test/test_shared_helm_cakephp_application.py
\ No newline at end of file
diff --git a/8.2/test/test_shared_helm_chart_imagestreams.py b/8.2/test/test_shared_helm_chart_imagestreams.py
new file mode 120000
index 000000000..58132e862
--- /dev/null
+++ b/8.2/test/test_shared_helm_chart_imagestreams.py
@@ -0,0 +1 @@
+../../test/test_shared_helm_chart_imagestreams.py
\ No newline at end of file
diff --git a/8.3/test/test_deploy_templates.py b/8.3/test/test_deploy_templates.py
deleted file mode 120000
index 2b15b63f4..000000000
--- a/8.3/test/test_deploy_templates.py
+++ /dev/null
@@ -1 +0,0 @@
-../../test/test_deploy_templates.py
\ No newline at end of file
diff --git a/8.3/test/test_helm_cakephp_application.py b/8.3/test/test_helm_cakephp_application.py
deleted file mode 120000
index 8f9bd862c..000000000
--- a/8.3/test/test_helm_cakephp_application.py
+++ /dev/null
@@ -1 +0,0 @@
-../../test/test_helm_cakephp_application.py
\ No newline at end of file
diff --git a/8.3/test/test_helm_chart_imagestreams.py b/8.3/test/test_helm_chart_imagestreams.py
deleted file mode 120000
index c8627f9b5..000000000
--- a/8.3/test/test_helm_chart_imagestreams.py
+++ /dev/null
@@ -1 +0,0 @@
-../../test/test_helm_chart_imagestreams.py
\ No newline at end of file
diff --git a/8.3/test/test_latest_imagestreams.py b/8.3/test/test_latest_imagestreams.py
deleted file mode 120000
index 7c2583ef5..000000000
--- a/8.3/test/test_latest_imagestreams.py
+++ /dev/null
@@ -1 +0,0 @@
-../../test/test_latest_imagestreams.py
\ No newline at end of file
diff --git a/8.3/test/test_php_deploy_templates.py b/8.3/test/test_php_deploy_templates.py
new file mode 120000
index 000000000..092efcb71
--- /dev/null
+++ b/8.3/test/test_php_deploy_templates.py
@@ -0,0 +1 @@
+../../test/test_php_deploy_templates.py
\ No newline at end of file
diff --git a/8.3/test/test_php_latest_imagestreams.py b/8.3/test/test_php_latest_imagestreams.py
new file mode 120000
index 000000000..b4384d6a0
--- /dev/null
+++ b/8.3/test/test_php_latest_imagestreams.py
@@ -0,0 +1 @@
+../../test/test_php_latest_imagestreams.py
\ No newline at end of file
diff --git a/8.3/test/test_php_s2i_imagestreams.py b/8.3/test/test_php_s2i_imagestreams.py
new file mode 120000
index 000000000..acb01691f
--- /dev/null
+++ b/8.3/test/test_php_s2i_imagestreams.py
@@ -0,0 +1 @@
+../../test/test_php_s2i_imagestreams.py
\ No newline at end of file
diff --git a/8.3/test/test_php_s2i_integration.py b/8.3/test/test_php_s2i_integration.py
new file mode 120000
index 000000000..68fa032e0
--- /dev/null
+++ b/8.3/test/test_php_s2i_integration.py
@@ -0,0 +1 @@
+../../test/test_php_s2i_integration.py
\ No newline at end of file
diff --git a/8.3/test/test_s2i_imagestreams.py b/8.3/test/test_s2i_imagestreams.py
deleted file mode 120000
index 00c872cba..000000000
--- a/8.3/test/test_s2i_imagestreams.py
+++ /dev/null
@@ -1 +0,0 @@
-../../test/test_s2i_imagestreams.py
\ No newline at end of file
diff --git a/8.3/test/test_s2i_integration.py b/8.3/test/test_s2i_integration.py
deleted file mode 120000
index c7827e840..000000000
--- a/8.3/test/test_s2i_integration.py
+++ /dev/null
@@ -1 +0,0 @@
-../../test/test_s2i_integration.py
\ No newline at end of file
diff --git a/8.3/test/test_shared_helm_cakephp_application.py b/8.3/test/test_shared_helm_cakephp_application.py
new file mode 120000
index 000000000..dd36f6162
--- /dev/null
+++ b/8.3/test/test_shared_helm_cakephp_application.py
@@ -0,0 +1 @@
+../../test/test_shared_helm_cakephp_application.py
\ No newline at end of file
diff --git a/8.3/test/test_shared_helm_chart_imagestreams.py b/8.3/test/test_shared_helm_chart_imagestreams.py
new file mode 120000
index 000000000..58132e862
--- /dev/null
+++ b/8.3/test/test_shared_helm_chart_imagestreams.py
@@ -0,0 +1 @@
+../../test/test_shared_helm_chart_imagestreams.py
\ No newline at end of file
diff --git a/test/test_deploy_templates.py b/test/test_php_deploy_templates.py
similarity index 100%
rename from test/test_deploy_templates.py
rename to test/test_php_deploy_templates.py
diff --git a/test/test_latest_imagestreams.py b/test/test_php_latest_imagestreams.py
similarity index 100%
rename from test/test_latest_imagestreams.py
rename to test/test_php_latest_imagestreams.py
diff --git a/test/test_s2i_imagestreams.py b/test/test_php_s2i_imagestreams.py
similarity index 100%
rename from test/test_s2i_imagestreams.py
rename to test/test_php_s2i_imagestreams.py
diff --git a/test/test_s2i_integration.py b/test/test_php_s2i_integration.py
similarity index 100%
rename from test/test_s2i_integration.py
rename to test/test_php_s2i_integration.py
diff --git a/test/test_helm_cakephp_application.py b/test/test_shared_helm_cakephp_application.py
similarity index 100%
rename from test/test_helm_cakephp_application.py
rename to test/test_shared_helm_cakephp_application.py
diff --git a/test/test_helm_chart_imagestreams.py b/test/test_shared_helm_chart_imagestreams.py
similarity index 100%
rename from test/test_helm_chart_imagestreams.py
rename to test/test_shared_helm_chart_imagestreams.py