diff --git a/testing/btest/scripts/base/frameworks/logging/rotation.trace b/testing/btest/Traces/rotation.trace
similarity index 100%
rename from testing/btest/scripts/base/frameworks/logging/rotation.trace
rename to testing/btest/Traces/rotation.trace
diff --git a/testing/btest/core/leaks/dataseries-rotate.bro b/testing/btest/core/leaks/dataseries-rotate.bro
index 1afc517d1a..f0a5f3079d 100644
--- a/testing/btest/core/leaks/dataseries-rotate.bro
+++ b/testing/btest/core/leaks/dataseries-rotate.bro
@@ -5,7 +5,7 @@
 # @TEST-GROUP: leaks
 # @TEST-GROUP: dataseries
 #           
-# @TEST-EXEC: HEAP_CHECK_DUMP_DIRECTORY=. HEAPCHECK=local bro -m -b -r %DIR/../rotation.trace %INPUT Log::default_writer=Log::WRITER_DATASERIES
+# @TEST-EXEC: HEAP_CHECK_DUMP_DIRECTORY=. HEAPCHECK=local bro -m -b -r $TRACES/rotation.trace %INPUT Log::default_writer=Log::WRITER_DATASERIES
 
 module Test;
 
diff --git a/testing/btest/scripts/base/frameworks/logging/dataseries/rotate.bro b/testing/btest/scripts/base/frameworks/logging/dataseries/rotate.bro
index 652a4596fb..7b708473e3 100644
--- a/testing/btest/scripts/base/frameworks/logging/dataseries/rotate.bro
+++ b/testing/btest/scripts/base/frameworks/logging/dataseries/rotate.bro
@@ -2,7 +2,7 @@
 # @TEST-REQUIRES: has-writer DataSeries && which ds2txt
 # @TEST-GROUP: dataseries
 #
-# @TEST-EXEC: bro -b -r %DIR/../rotation.trace %INPUT 2>&1 Log::default_writer=Log::WRITER_DATASERIES | grep "test" >out
+# @TEST-EXEC: bro -b -r ${TRACES}/rotation.trace %INPUT 2>&1 Log::default_writer=Log::WRITER_DATASERIES | grep "test" >out
 # @TEST-EXEC: for i in test.*.ds; do printf '> %s\n' $i; ds2txt --skip-index $i; done >>out
 # @TEST-EXEC: btest-diff out
 
diff --git a/testing/btest/scripts/base/frameworks/logging/rotate.bro b/testing/btest/scripts/base/frameworks/logging/rotate.bro
index 14123c56c6..212dba3bf7 100644
--- a/testing/btest/scripts/base/frameworks/logging/rotate.bro
+++ b/testing/btest/scripts/base/frameworks/logging/rotate.bro
@@ -1,5 +1,5 @@
 #
-# @TEST-EXEC: bro -b -r %DIR/rotation.trace %INPUT 2>&1 | grep "test" >out
+# @TEST-EXEC: bro -b -r ${TRACES}/rotation.trace %INPUT 2>&1 | grep "test" >out
 # @TEST-EXEC: for i in test.*.log; do printf '> %s\n' $i; cat $i; done >>out
 # @TEST-EXEC: btest-diff out