diff --git a/contrib/jenkins-run.sh b/contrib/jenkins-run.sh
index e82f5620..7d796b5d 100755
--- a/contrib/jenkins-run.sh
+++ b/contrib/jenkins-run.sh
@@ -8,8 +8,8 @@ fi
 
 osmo_gsm_tester_host="$OSMO_GSM_TESTER_REMOTE_MAIN_UNIT"
 osmo_gsm_tester_src="${OSMO_GSM_TESTER_REMOTE_SRC:-/usr/local/src/osmo-gsm-tester}"
-osmo_gsm_tester_dir="/var/tmp/osmo-gsm-tester"
-tmp_dir="/var/tmp/prep-osmo-gsm-tester"
+osmo_gsm_tester_dir="/var/tmp/osmo-gsm-tester/trials"
+tmp_dir="/var/tmp/osmo-gsm-tester/.prep-trials"
 
 #trial_name="$NODE_NAME-$BUILD_TAG"
 trial_name="trial-$BUILD_NUMBER"
diff --git a/contrib/trials-cleanup.sh b/contrib/trials-cleanup.sh
index baf9c2bf..830f4e71 100755
--- a/contrib/trials-cleanup.sh
+++ b/contrib/trials-cleanup.sh
@@ -4,10 +4,10 @@
 trial_rx_dir="$1"
 trial_prep_dir="$2"
 if [ -z "$trial_rx_dir" ]; then
-	trial_rx_dir="/var/tmp/osmo-gsm-tester"
+	trial_rx_dir="/var/tmp/osmo-gsm-tester/trials"
 fi
 if [ -z "$trial_prep_dir" ]; then
-	trial_prep_dir="/var/tmp/prep-osmo-gsm-tester"
+	trial_prep_dir="/var/tmp/osmo-gsm-tester/.prep-trials"
 fi
 
 mkdir -p "$trial_prep_dir"
diff --git a/example/paths.conf b/example/paths.conf
index 3458a1d7..554d9420 100644
--- a/example/paths.conf
+++ b/example/paths.conf
@@ -1,3 +1,3 @@
-state_dir: './state'
+state_dir: '/var/tmp/osmo-gsm-tester/state'
 suites_dir: '../suites'
 scenarios_dir: './scenarios'