diff --git a/spice/test/spice_gate_advanced.tcl b/spice/test/spice_gate_advanced.tcl
index 390a9461..97793a9c 100644
--- a/spice/test/spice_gate_advanced.tcl
+++ b/spice/test/spice_gate_advanced.tcl
@@ -55,7 +55,7 @@ set spice_dir2 [make_result_file spice_adv_path]
 file mkdir $spice_dir2
 write_path_spice \
   -path_args {-sort_by_slack -path_delay max} \
-  -spice_directory $spice_dir2 \
+  -spice_file [file join $spice_dir2 spice] \
   -lib_subckt_file $subckt_file \
   -model_file $model_file \
   -power VDD \
@@ -69,7 +69,7 @@ set spice_dir3 [make_result_file spice_adv_min]
 file mkdir $spice_dir3
 write_path_spice \
   -path_args {-path_delay min} \
-  -spice_directory $spice_dir3 \
+  -spice_file [file join $spice_dir3 spice] \
   -lib_subckt_file $subckt_file \
   -model_file $model_file \
   -power VDD \
@@ -83,7 +83,7 @@ set spice_dir4 [make_result_file spice_adv_hspice]
 file mkdir $spice_dir4
 write_path_spice \
   -path_args {-sort_by_slack} \
-  -spice_directory $spice_dir4 \
+  -spice_file [file join $spice_dir4 spice] \
   -lib_subckt_file $subckt_file \
   -model_file $model_file \
   -power VDD \
@@ -98,9 +98,10 @@ set spice_dir5 [make_result_file spice_adv_xyce]
 file mkdir $spice_dir5
 write_path_spice \
   -path_args {-sort_by_slack} \
-  -spice_directory $spice_dir5 \
+  -spice_file [file join $spice_dir5 spice] \
   -lib_subckt_file $subckt_file \
   -model_file $model_file \
   -power VDD \
   -ground VSS \
   -simulator xyce
+
diff --git a/spice/test/spice_gcd_gate.tcl b/spice/test/spice_gcd_gate.tcl
index 34ec98d1..90ed9f92 100644
--- a/spice/test/spice_gcd_gate.tcl
+++ b/spice/test/spice_gcd_gate.tcl
@@ -65,7 +65,7 @@ set pdir1 [make_result_file spice_gcd_path_ng]
 file mkdir $pdir1
 write_path_spice \
   -path_args {-sort_by_slack -path_delay max} \
-  -spice_directory $pdir1 \
+  -spice_file [file join $pdir1 spice] \
   -lib_subckt_file $subckt_file \
   -model_file $model_file \
   -power VPWR \
@@ -77,7 +77,7 @@ set pdir2 [make_result_file spice_gcd_path_hs]
 file mkdir $pdir2
 write_path_spice \
   -path_args {-path_delay min} \
-  -spice_directory $pdir2 \
+  -spice_file [file join $pdir2 spice] \
   -lib_subckt_file $subckt_file \
   -model_file $model_file \
   -power VPWR \
@@ -89,9 +89,10 @@ set pdir3 [make_result_file spice_gcd_path_xy]
 file mkdir $pdir3
 write_path_spice \
   -path_args {-sort_by_slack} \
-  -spice_directory $pdir3 \
+  -spice_file [file join $pdir3 spice] \
   -lib_subckt_file $subckt_file \
   -model_file $model_file \
   -power VPWR \
   -ground VGND \
   -simulator xyce
+
diff --git a/spice/test/spice_gcd_path.tcl b/spice/test/spice_gcd_path.tcl
index 987ef61b..4a387bb3 100644
--- a/spice/test/spice_gcd_path.tcl
+++ b/spice/test/spice_gcd_path.tcl
@@ -70,7 +70,7 @@ set dir1 [make_result_file spice_gcd_max]
 file mkdir $dir1
 write_path_spice \
   -path_args {-sort_by_slack} \
-  -spice_directory $dir1 \
+  -spice_file [file join $dir1 spice] \
   -lib_subckt_file $subckt_file \
   -model_file $model_file \
   -power VPWR \
@@ -84,7 +84,7 @@ set dir2 [make_result_file spice_gcd_min]
 file mkdir $dir2
 write_path_spice \
   -path_args {-path_delay min} \
-  -spice_directory $dir2 \
+  -spice_file [file join $dir2 spice] \
   -lib_subckt_file $subckt_file \
   -model_file $model_file \
   -power VPWR \
@@ -99,7 +99,7 @@ set dir3 [make_result_file spice_gcd_hspice]
 file mkdir $dir3
 write_path_spice \
   -path_args {-sort_by_slack} \
-  -spice_directory $dir3 \
+  -spice_file [file join $dir3 spice] \
   -lib_subckt_file $subckt_file \
   -model_file $model_file \
   -power VPWR \
@@ -115,7 +115,7 @@ set dir4 [make_result_file spice_gcd_xyce]
 file mkdir $dir4
 write_path_spice \
   -path_args {-sort_by_slack} \
-  -spice_directory $dir4 \
+  -spice_file [file join $dir4 spice] \
   -lib_subckt_file $subckt_file \
   -model_file $model_file \
   -power VPWR \
@@ -131,7 +131,7 @@ set dir5 [make_result_file spice_gcd_specific]
 file mkdir $dir5
 write_path_spice \
   -path_args {-from req_msg[0]} \
-  -spice_directory $dir5 \
+  -spice_file [file join $dir5 spice] \
   -lib_subckt_file $subckt_file \
   -model_file $model_file \
   -power VPWR \
diff --git a/spice/test/spice_multipath.tcl b/spice/test/spice_multipath.tcl
index 9a6f9080..e8c14eda 100644
--- a/spice/test/spice_multipath.tcl
+++ b/spice/test/spice_multipath.tcl
@@ -106,7 +106,7 @@ set spice_dir1 [make_result_file spice_mp_max]
 file mkdir $spice_dir1
 write_path_spice \
   -path_args {-sort_by_slack} \
-  -spice_directory $spice_dir1 \
+  -spice_file [file join $spice_dir1 spice] \
   -lib_subckt_file $subckt_file \
   -model_file $model_file \
   -power VDD \
@@ -120,7 +120,7 @@ set spice_dir2 [make_result_file spice_mp_min]
 file mkdir $spice_dir2
 write_path_spice \
   -path_args {-path_delay min} \
-  -spice_directory $spice_dir2 \
+  -spice_file [file join $spice_dir2 spice] \
   -lib_subckt_file $subckt_file \
   -model_file $model_file \
   -power VDD \
@@ -135,7 +135,7 @@ set spice_dir3 [make_result_file spice_mp_specific]
 file mkdir $spice_dir3
 write_path_spice \
   -path_args {-from in1} \
-  -spice_directory $spice_dir3 \
+  -spice_file [file join $spice_dir3 spice] \
   -lib_subckt_file $subckt_file \
   -model_file $model_file \
   -power VDD \
@@ -149,7 +149,7 @@ set spice_dir4 [make_result_file spice_mp_hspice]
 file mkdir $spice_dir4
 write_path_spice \
   -path_args {-sort_by_slack} \
-  -spice_directory $spice_dir4 \
+  -spice_file [file join $spice_dir4 spice] \
   -lib_subckt_file $subckt_file \
   -model_file $model_file \
   -power VDD \
@@ -164,9 +164,10 @@ set spice_dir5 [make_result_file spice_mp_xyce]
 file mkdir $spice_dir5
 write_path_spice \
   -path_args {-sort_by_slack} \
-  -spice_directory $spice_dir5 \
+  -spice_file [file join $spice_dir5 spice] \
   -lib_subckt_file $subckt_file \
   -model_file $model_file \
   -power VDD \
   -ground VSS \
   -simulator xyce
+
diff --git a/spice/test/spice_path_min.tcl b/spice/test/spice_path_min.tcl
index 79ccbe0c..72f07e57 100644
--- a/spice/test/spice_path_min.tcl
+++ b/spice/test/spice_path_min.tcl
@@ -79,7 +79,7 @@ set spice_dir_min [make_result_file spice_min_out]
 file mkdir $spice_dir_min
 write_path_spice \
   -path_args {-path_delay min} \
-  -spice_directory $spice_dir_min \
+  -spice_file [file join $spice_dir_min spice] \
   -lib_subckt_file $subckt_file \
   -model_file $model_file \
   -power VDD \
@@ -93,7 +93,7 @@ set spice_dir_max [make_result_file spice_max_out]
 file mkdir $spice_dir_max
 write_path_spice \
   -path_args {-path_delay max -sort_by_slack} \
-  -spice_directory $spice_dir_max \
+  -spice_file [file join $spice_dir_max spice] \
   -lib_subckt_file $subckt_file \
   -model_file $model_file \
   -power VDD \
@@ -107,7 +107,7 @@ set spice_dir_hs [make_result_file spice_hs_out]
 file mkdir $spice_dir_hs
 write_path_spice \
   -path_args {-sort_by_slack} \
-  -spice_directory $spice_dir_hs \
+  -spice_file [file join $spice_dir_hs spice] \
   -lib_subckt_file $subckt_file \
   -model_file $model_file \
   -power VDD \
@@ -122,7 +122,7 @@ set spice_dir_xy [make_result_file spice_xy_out]
 file mkdir $spice_dir_xy
 write_path_spice \
   -path_args {-sort_by_slack} \
-  -spice_directory $spice_dir_xy \
+  -spice_file [file join $spice_dir_xy spice] \
   -lib_subckt_file $subckt_file \
   -model_file $model_file \
   -power VDD \
@@ -138,8 +138,9 @@ set spice_dir_sp [make_result_file spice_specific_out]
 file mkdir $spice_dir_sp
 write_path_spice \
   -path_args {-from in1} \
-  -spice_directory $spice_dir_sp \
+  -spice_file [file join $spice_dir_sp spice] \
   -lib_subckt_file $subckt_file \
   -model_file $model_file \
   -power VDD \
   -ground VSS
+
diff --git a/spice/test/spice_subckt_file.tcl b/spice/test/spice_subckt_file.tcl
index 7e7a9a6e..9c89c792 100644
--- a/spice/test/spice_subckt_file.tcl
+++ b/spice/test/spice_subckt_file.tcl
@@ -70,7 +70,7 @@ set spice_dir2 [file join $spice_dir path_out1]
 file mkdir $spice_dir2
 write_path_spice \
   -path_args {-to out1 -path_delay max} \
-  -spice_directory $spice_dir2 \
+  -spice_file [file join $spice_dir2 spice] \
   -lib_subckt_file $subckt_file \
   -model_file $model_file \
   -power VDD \
@@ -81,7 +81,7 @@ set spice_dir3 [file join $spice_dir path_out2]
 file mkdir $spice_dir3
 write_path_spice \
   -path_args {-to out2 -path_delay max} \
-  -spice_directory $spice_dir3 \
+  -spice_file [file join $spice_dir3 spice] \
   -lib_subckt_file $subckt_file \
   -model_file $model_file \
   -power VDD \
@@ -92,7 +92,7 @@ set spice_dir4 [file join $spice_dir path_ng]
 file mkdir $spice_dir4
 write_path_spice \
   -path_args {-sort_by_slack} \
-  -spice_directory $spice_dir4 \
+  -spice_file [file join $spice_dir4 spice] \
   -lib_subckt_file $subckt_file \
   -model_file $model_file \
   -power VDD \
diff --git a/spice/test/spice_write_options.tcl b/spice/test/spice_write_options.tcl
index a63ec4af..ee030250 100644
--- a/spice/test/spice_write_options.tcl
+++ b/spice/test/spice_write_options.tcl
@@ -45,7 +45,7 @@ close $subckt_fh
 puts "--- write_path_spice default ---"
 write_path_spice \
   -path_args {-sort_by_slack} \
-  -spice_directory $spice_dir \
+  -spice_file [file join $spice_dir spice] \
   -lib_subckt_file $subckt_file \
   -model_file $model_file \
   -power VDD \
@@ -54,7 +54,7 @@ write_path_spice \
 puts "--- write_path_spice with -simulator hspice ---"
 write_path_spice \
   -path_args {-sort_by_slack} \
-  -spice_directory $spice_dir \
+  -spice_file [file join $spice_dir spice] \
   -lib_subckt_file $subckt_file \
   -model_file $model_file \
   -power VDD \
@@ -64,7 +64,7 @@ write_path_spice \
 puts "--- write_path_spice with -simulator xyce ---"
 write_path_spice \
   -path_args {-sort_by_slack} \
-  -spice_directory $spice_dir \
+  -spice_file [file join $spice_dir spice] \
   -lib_subckt_file $subckt_file \
   -model_file $model_file \
   -power VDD \