diff --git a/test/groovy/SeleniumExecuteTestsTest.groovy b/test/groovy/SeleniumExecuteTestsTest.groovy
index ec9f10e8f..1b73081cd 100644
--- a/test/groovy/SeleniumExecuteTestsTest.groovy
+++ b/test/groovy/SeleniumExecuteTestsTest.groovy
@@ -31,6 +31,7 @@ class SeleniumExecuteTestsTest extends BasePiperTest {
     @Before
     void init() throws Exception {
         bodyExecuted = false
+        helper.registerAllowedMethod('stash', [String.class], null)
         helper.registerAllowedMethod('git', [Map.class], {m ->
             gitMap = m
         })
diff --git a/vars/seleniumExecuteTests.groovy b/vars/seleniumExecuteTests.groovy
index 0404839ca..c23325d08 100644
--- a/vars/seleniumExecuteTests.groovy
+++ b/vars/seleniumExecuteTests.groovy
@@ -1,9 +1,10 @@
-import com.sap.piper.Utils
 import com.sap.piper.ConfigurationHelper
+import com.sap.piper.GitUtils
 import com.sap.piper.Utils
 import com.sap.piper.k8s.ContainerMap
-import groovy.transform.Field
+
 import groovy.text.SimpleTemplateEngine
+import groovy.transform.Field
 
 @Field String STEP_NAME = 'seleniumExecuteTests'
 @Field Set STEP_CONFIG_KEYS = [
@@ -42,31 +43,26 @@ def call(Map parameters = [:], Closure body) {
 
         utils.pushToSWA([step: STEP_NAME], config)
 
+        config.stashContent = config.testRepository
+            ?[GitUtils.handleTestRepository(this, config)]
+            :utils.unstashAll(config.stashContent)
+
         dockerExecute(
-                script: script,
-                containerPortMappings: config.containerPortMappings,
-                dockerImage: config.dockerImage,
-                dockerName: config.dockerName,
-                dockerWorkspace: config.dockerWorkspace,
-                sidecarEnvVars: config.sidecarEnvVars,
-                sidecarImage: config.sidecarImage,
-                sidecarName: config.sidecarName,
-                sidecarVolumeBind: config.sidecarVolumeBind
+            script: script,
+            containerPortMappings: config.containerPortMappings,
+            dockerImage: config.dockerImage,
+            dockerName: config.dockerName,
+            dockerWorkspace: config.dockerWorkspace,
+            sidecarEnvVars: config.sidecarEnvVars,
+            sidecarImage: config.sidecarImage,
+            sidecarName: config.sidecarName,
+            sidecarVolumeBind: config.sidecarVolumeBind,
+            stashContent: config.stashContent
         ) {
             try {
-                if (config.testRepository) {
-                    def gitParameters = [url: config.testRepository]
-                    if (config.gitSshKeyCredentialsId) gitParameters.credentialsId = config.gitSshKeyCredentialsId
-                    if (config.gitBranch) gitParameters.branch = config.gitBranch
-                    git gitParameters
-                } else {
-                    config.stashContent = utils.unstashAll(config.stashContent)
-                }
                 body()
             } catch (err) {
-                if (config.failOnError) {
-                    throw err
-                }
+                if (config.failOnError) throw err
             }
         }
     }