diff --git a/tests/gen-tests-makefile.sh b/tests/gen-tests-makefile.sh
index 146bb5e81..e3308506b 100755
--- a/tests/gen-tests-makefile.sh
+++ b/tests/gen-tests-makefile.sh
@@ -17,20 +17,20 @@ generate_target() {
 generate_ys_test() {
 	ys_file=$1
 	yosys_args_=${2:-}
-	generate_target "$ys_file" "\"$YOSYS_BASEDIR/yosys\" -ql ${ys_file%.*}.log $yosys_args_ $ys_file"
+	generate_target "$ys_file" "\"$YOSYS_BASEDIR/yosys\" -ql ${ys_file}.err $yosys_args_ $ys_file && mv ${ys_file}.err ${ys_file}.log"
 }
 
 # $ generate_tcl_test tcl_file [yosys_args]
 generate_tcl_test() {
 	tcl_file=$1
 	yosys_args_=${2:-}
-	generate_target "$tcl_file" "\"$YOSYS_BASEDIR/yosys\" -ql ${tcl_file%.*}.log $yosys_args_ $tcl_file"
+	generate_target "$tcl_file" "\"$YOSYS_BASEDIR/yosys\" -ql ${tcl_file}.err $yosys_args_ $tcl_file && mv ${tcl_file}.err ${tcl_file}.log"
 }
 
 # $ generate_bash_test bash_file
 generate_bash_test() {
 	bash_file=$1
-	generate_target "$bash_file" "bash -v $bash_file >${bash_file%.*}.log 2>&1"
+	generate_target "$bash_file" "bash -v $bash_file >${bash_file}.err 2>&1 && mv ${bash_file}.err ${bash_file}.log"
 }
 
 # $ generate_tests [-y|--yosys-scripts] [-s|--prove-sv] [-b|--bash] [-a|--yosys-args yosys_args]