diff --git a/tests/integration/Makefile b/tests/integration/Makefile
index b84ac8b92a..f61fbdc6ef 100644
--- a/tests/integration/Makefile
+++ b/tests/integration/Makefile
@@ -1,3 +1,4 @@
+# This is meant to be run from `make check` or `make build-tests` in root directory
 # To run this not through the repo root Makefile, please provide the $KAPPABIN path
 OUTPUT_PATH:=output
 ERROR:=error
@@ -19,6 +20,7 @@ help:
 	@echo 'make clean:     recursively clean everything but the reference files'
 	@echo 'make clean_all: recursively clean everything including the reference files'
 	@echo
+	@echo 'This is meant to be run from `make check` or `make build-tests` in root directory'
 	@echo 'To run this from this directory and not from the root Makefile, please specify the KAPPABIN path in the environment.'
 
 # NOTE: COMMENT THIS TO DEBUG
diff --git a/tests/integration/cflows/cflows_json/README b/tests/integration/cflows/cflows_json/README
index d85e8f2b20..a25e0dce61 100644
--- a/tests/integration/cflows/cflows_json/README
+++ b/tests/integration/cflows/cflows_json/README
@@ -1,3 +1,5 @@
-#Command-line:
-"${KAPPABIN}"KaSim json.ka -seed 840540685 -l 5 -d output -trace /tmp/cflow-json-trace.json -syntax 4 || exit 0
-"${KAPPABIN}"KaStor --weak -format json /tmp/cflow-json-trace.json -d output --time-independent || exit 0
+#!/bin/sh
+TRACE_FILE="./tmp__cflow-json-trace.json"
+"${KAPPABIN}"KaSim json.ka -seed 840540685 -l 5 -d output -trace ${TRACE_FILE} -syntax 4 || exit 0
+"${KAPPABIN}"KaStor --weak -format json ${TRACE_FILE} -d output --time-independent || exit 0
+rm -f ${TRACE_FILE}
diff --git a/tests/integration/cflows/cflows_json/output/LOG.ref b/tests/integration/cflows/cflows_json/output/LOG.ref
index 12dc67ab16..a27666c2f9 100644
--- a/tests/integration/cflows/cflows_json/output/LOG.ref
+++ b/tests/integration/cflows/cflows_json/output/LOG.ref
@@ -13,7 +13,7 @@ done
 	 -initial conditions
 + Building initial state (2000 agents)
 Done
-+ Command line to rerun is: 'KaSim' 'json.ka' '-seed' '840540685' '-l' '5' '-d' 'output' '-trace' '/tmp/cflow-json-trace.json' '-syntax' '4'
++ Command line to rerun is: 'KaSim' 'json.ka' '-seed' '840540685' '-l' '5' '-d' 'output' '-trace' './tmp__cflow-json-trace.json' '-syntax' '4'
 ______________________________________________________________________
 ######################################################################
 Simulation ended
diff --git a/tests/integration/cflows/cflows_json/output/data.csv.ref b/tests/integration/cflows/cflows_json/output/data.csv.ref
index efbab6f81b..017febd8cd 100644
--- a/tests/integration/cflows/cflows_json/output/data.csv.ref
+++ b/tests/integration/cflows/cflows_json/output/data.csv.ref
@@ -1,4 +1,4 @@
-# Output of 'KaSim' 'json.ka' '-seed' '840540685' '-l' '5' '-d' 'output' '-trace' '/tmp/cflow-json-trace.json' '-syntax' '4'
+# Output of 'KaSim' 'json.ka' '-seed' '840540685' '-l' '5' '-d' 'output' '-trace' './tmp__cflow-json-trace.json' '-syntax' '4'
 "[T]","ApBp","ABA"
 0.,0,0
 1.,66,0
diff --git a/tests/integration/cflows/cflows_json/output/inputs.ka.ref b/tests/integration/cflows/cflows_json/output/inputs.ka.ref
index da46035e86..cc09e42144 100644
--- a/tests/integration/cflows/cflows_json/output/inputs.ka.ref
+++ b/tests/integration/cflows/cflows_json/output/inputs.ka.ref
@@ -5,7 +5,7 @@
 %def: "progressBarSymbol" "#"
 %def: "plotPeriod" "1" "t.u."
 %def: "outputFileName" "data.csv"
-%def: "traceFileName" "/tmp/cflow-json-trace.json"
+%def: "traceFileName" "./tmp__cflow-json-trace.json"
 
 %agent: A(a{u p}[a.B b.B])
 %agent: B(a{u p}[a.A] b[a.A])
diff --git a/tests/integration/simulation/marshal/README b/tests/integration/simulation/marshal/README
index 1b31b742a6..b4d46e5772 100644
--- a/tests/integration/simulation/marshal/README
+++ b/tests/integration/simulation/marshal/README
@@ -1,7 +1,5 @@
 #!/bin/sh
-
-BLOB=/tmp/KaSim-test-blob-$(basename $PWD)
-
+BLOB=./tmp__KaSim-test-blob-$(basename $PWD)
 "${KAPPABIN}"KaSim --compile -make-sim ${BLOB} -seed 496408597 -d output model.ka -syntax 4 && \
 "${KAPPABIN}"KaSim --compile -load-sim ${BLOB} -seed 958076642 -d output -syntax 4 && \
 "${KAPPABIN}"KaSim --compile -load-sim ${BLOB} -seed 458154606 -d output -var init 300 -syntax 4 || exit 0
diff --git a/tests/integration/simulation/marshal/output/LOG.ref b/tests/integration/simulation/marshal/output/LOG.ref
index 6851441938..230e7d95e8 100644
--- a/tests/integration/simulation/marshal/output/LOG.ref
+++ b/tests/integration/simulation/marshal/output/LOG.ref
@@ -13,12 +13,12 @@ done
 	 -initial conditions
 + Building initial state (200 agents)
 Done
-+ Command line to rerun is: 'KaSim' '--compile' '-make-sim' '/tmp/KaSim-test-blob-marshal' '-seed' '496408597' '-d' 'output' 'model.ka' '-syntax' '4'
-+ Loading simulation package /tmp/KaSim-test-blob-marshal...
++ Command line to rerun is: 'KaSim' '--compile' '-make-sim' './tmp__KaSim-test-blob-marshal' '-seed' '496408597' '-d' 'output' 'model.ka' '-syntax' '4'
++ Loading simulation package ./tmp__KaSim-test-blob-marshal...
 + Building initial state (200 agents)
 Done
-+ Command line to rerun is: 'KaSim' '--compile' '-load-sim' '/tmp/KaSim-test-blob-marshal' '-seed' '958076642' '-d' 'output' '-syntax' '4'
-+ Loading simulation package /tmp/KaSim-test-blob-marshal...
++ Command line to rerun is: 'KaSim' '--compile' '-load-sim' './tmp__KaSim-test-blob-marshal' '-seed' '958076642' '-d' 'output' '-syntax' '4'
++ Loading simulation package ./tmp__KaSim-test-blob-marshal...
 + Building initial state (600 agents)
 Done
-+ Command line to rerun is: 'KaSim' '--compile' '-load-sim' '/tmp/KaSim-test-blob-marshal' '-seed' '458154606' '-d' 'output' '-var' 'init' '300' '-syntax' '4'
++ Command line to rerun is: 'KaSim' '--compile' '-load-sim' './tmp__KaSim-test-blob-marshal' '-seed' '458154606' '-d' 'output' '-var' 'init' '300' '-syntax' '4'