diff --git a/accounts/ui/tests/run-acceptance-test.sh b/accounts/ui/tests/run-acceptance-test.sh
index 17dbf544c6..1725cf772d 100755
--- a/accounts/ui/tests/run-acceptance-test.sh
+++ b/accounts/ui/tests/run-acceptance-test.sh
@@ -29,9 +29,9 @@ trap clean_up SIGHUP SIGINT SIGTERM
 if [ -z "$TEST_INFRA_DIRECTORY" ]
 then
 	cleanup=true
-	testFolder=$(mktemp -d)
+	testFolder=$(mktemp -d -p .)
 	printf "creating folder $testFolder for Test infrastructure setup\n\n"
-	export TEST_INFRA_DIRECTORY=$testFolder
+	export TEST_INFRA_DIRECTORY=$testFolder/tests
 fi
 
 clean_up() {
diff --git a/settings/ui/tests/run-acceptance-test.sh b/settings/ui/tests/run-acceptance-test.sh
index 17dbf544c6..1725cf772d 100755
--- a/settings/ui/tests/run-acceptance-test.sh
+++ b/settings/ui/tests/run-acceptance-test.sh
@@ -29,9 +29,9 @@ trap clean_up SIGHUP SIGINT SIGTERM
 if [ -z "$TEST_INFRA_DIRECTORY" ]
 then
 	cleanup=true
-	testFolder=$(mktemp -d)
+	testFolder=$(mktemp -d -p .)
 	printf "creating folder $testFolder for Test infrastructure setup\n\n"
-	export TEST_INFRA_DIRECTORY=$testFolder
+	export TEST_INFRA_DIRECTORY=$testFolder/tests
 fi
 
 clean_up() {