diff --git a/test/groovy/ArtifactSetVersionTest.groovy b/test/groovy/ArtifactSetVersionTest.groovy
index 573a18954..52ecae80e 100644
--- a/test/groovy/ArtifactSetVersionTest.groovy
+++ b/test/groovy/ArtifactSetVersionTest.groovy
@@ -43,7 +43,7 @@ class ArtifactSetVersionTest extends BasePiperTest {
         .around(thrown)
         .around(jlr)
         .around(jscr)
-        .around(new JenkinsReadMavenPomRule(this, 'test/resources/MavenArtifactVersioning'))
+        .around(new JenkinsReadMavenPomRule(this, 'test/resources/versioning/MavenArtifactVersioning'))
         .around(jwfr)
         .around(jder)
         .around(jsr)
diff --git a/test/groovy/com/sap/piper/versioning/DockerArtifactVersioningTest.groovy b/test/groovy/com/sap/piper/versioning/DockerArtifactVersioningTest.groovy
index 31ff8fc79..99a8c716b 100644
--- a/test/groovy/com/sap/piper/versioning/DockerArtifactVersioningTest.groovy
+++ b/test/groovy/com/sap/piper/versioning/DockerArtifactVersioningTest.groovy
@@ -20,7 +20,7 @@ class DockerArtifactVersioningTest extends BasePiperTest{
 
     String passedDir
 
-    JenkinsReadFileRule jrfr = new JenkinsReadFileRule(this, 'test/resources/DockerArtifactVersioning')
+    JenkinsReadFileRule jrfr = new JenkinsReadFileRule(this, 'test/resources/versioning/DockerArtifactVersioning')
     JenkinsWriteFileRule jwfr = new JenkinsWriteFileRule(this)
     JenkinsLoggingRule jlr = new JenkinsLoggingRule(this)
     ExpectedException thrown = ExpectedException.none()
diff --git a/test/groovy/com/sap/piper/versioning/MavenArtifactVersioningTest.groovy b/test/groovy/com/sap/piper/versioning/MavenArtifactVersioningTest.groovy
index 5b8eadb98..851b0e7d9 100644
--- a/test/groovy/com/sap/piper/versioning/MavenArtifactVersioningTest.groovy
+++ b/test/groovy/com/sap/piper/versioning/MavenArtifactVersioningTest.groovy
@@ -27,7 +27,7 @@ class MavenArtifactVersioningTest extends BasePiperTest{
         .getCommonRules(this)
         .around(new JenkinsReadYamlRule(this))
         .around(jscr)
-        .around(new JenkinsReadMavenPomRule(this, 'test/resources/MavenArtifactVersioning'))
+        .around(new JenkinsReadMavenPomRule(this, 'test/resources/versioning/MavenArtifactVersioning'))
 
     @Before
     void init() {
diff --git a/test/resources/DockerArtifactVersioning/Dockerfile b/test/resources/versioning/DockerArtifactVersioning/Dockerfile
similarity index 100%
rename from test/resources/DockerArtifactVersioning/Dockerfile
rename to test/resources/versioning/DockerArtifactVersioning/Dockerfile
diff --git a/test/resources/MavenArtifactVersioning/pom.xml b/test/resources/versioning/MavenArtifactVersioning/pom.xml
similarity index 100%
rename from test/resources/MavenArtifactVersioning/pom.xml
rename to test/resources/versioning/MavenArtifactVersioning/pom.xml
diff --git a/test/resources/MavenArtifactVersioning/snapshot/pom.xml b/test/resources/versioning/MavenArtifactVersioning/snapshot/pom.xml
similarity index 100%
rename from test/resources/MavenArtifactVersioning/snapshot/pom.xml
rename to test/resources/versioning/MavenArtifactVersioning/snapshot/pom.xml
diff --git a/vars/dockerExecute.groovy b/vars/dockerExecute.groovy
index 02fae337c..df47c1acb 100644
--- a/vars/dockerExecute.groovy
+++ b/vars/dockerExecute.groovy
@@ -24,8 +24,8 @@ void call(Map parameters = [:], body) {
         Map config = ConfigurationHelper
             .loadStepDefaults(this)
             .mixinGeneralConfig(script.commonPipelineEnvironment, GENERAL_CONFIG_KEYS)
-            .mixinStageConfig(script.commonPipelineEnvironment, parameters.stageName?:env.STAGE_NAME, STEP_CONFIG_KEYS)
             .mixinStepConfig(script.commonPipelineEnvironment, STEP_CONFIG_KEYS)
+            .mixinStageConfig(script.commonPipelineEnvironment, parameters.stageName?:env.STAGE_NAME, STEP_CONFIG_KEYS)
             .mixin(parameters, PARAMETER_KEYS)
             .use()
         if (isKubernetes() && config.dockerImage) {
diff --git a/vars/dockerExecuteOnKubernetes.groovy b/vars/dockerExecuteOnKubernetes.groovy
index 60341c65e..132e51369 100644
--- a/vars/dockerExecuteOnKubernetes.groovy
+++ b/vars/dockerExecuteOnKubernetes.groovy
@@ -25,8 +25,8 @@ void call(Map parameters = [:], body) {
         ConfigurationHelper configHelper = ConfigurationHelper
             .loadStepDefaults(this)
             .mixinGeneralConfig(script.commonPipelineEnvironment, GENERAL_CONFIG_KEYS)
-            .mixinStageConfig(script.commonPipelineEnvironment, parameters.stageName ?: env.STAGE_NAME, STEP_CONFIG_KEYS)
             .mixinStepConfig(script.commonPipelineEnvironment, STEP_CONFIG_KEYS)
+            .mixinStageConfig(script.commonPipelineEnvironment, parameters.stageName ?: env.STAGE_NAME, STEP_CONFIG_KEYS)
             .mixin(parameters, PARAMETER_KEYS)
             .addIfEmpty('uniqueId', UUID.randomUUID().toString())
         Map config = [:]
diff --git a/vars/testsPublishResults.groovy b/vars/testsPublishResults.groovy
index 92fbca72d..d168eaaca 100644
--- a/vars/testsPublishResults.groovy
+++ b/vars/testsPublishResults.groovy
@@ -32,6 +32,7 @@ def call(Map parameters = [:]) {
             .loadStepDefaults(this)
             .mixinGeneralConfig(script.commonPipelineEnvironment, STEP_CONFIG_KEYS)
             .mixinStepConfig(script.commonPipelineEnvironment, STEP_CONFIG_KEYS)
+            .mixinStageConfig(script.commonPipelineEnvironment, parameters.stageName ?: env.STAGE_NAME, STEP_CONFIG_KEYS)
             .mixin(parameters, PARAMETER_KEYS)
             .use()