diff --git a/testbench/testbench_fp.sv b/testbench/testbench_fp.sv
index 43b8becff..48d4a293d 100644
--- a/testbench/testbench_fp.sv
+++ b/testbench/testbench_fp.sv
@@ -33,22 +33,7 @@ module testbench_fp;
   parameter string TEST="none"; // choices are cvtint, cvtfp, cmp, add, sub, mul, div, sqrt, fma; all does not check properly
   parameter string TEST_SIZE="all";
 
-  `include "parameter-defs.vh"   
-
-`ifdef VERILATOR
-    import "DPI-C" function string getenvval(input string env_name);
-    string       WALLY_DIR = getenvval("WALLY");
-`elsif VCS
-    import "DPI-C" function string getenv(input string env_name);
-    string       WALLY_DIR = getenv("WALLY");
-`else
-    string       WALLY_DIR = "$WALLY";
-`endif
-
-  string FP_TESTS = {WALLY_DIR, "/tests/fp/vectors"};
-  string pp;
-  if (P.IEEE754) assign pp = {FP_TESTS, "/ieee/"};
-  else assign pp = {FP_TESTS, "/riscv/"};
+  `include "parameter-defs.vh"
 
   parameter MAXVECTORS = 8388610;
 
@@ -671,6 +656,7 @@ module testbench_fp;
 
   // Read the first test
   initial begin
+    static string pp = `PATH;
     string testname;
     string tt0;
     tt0 = $sformatf("%s", Tests[TestNum]);
@@ -1009,7 +995,7 @@ module testbench_fp;
       // clear the vectors
       for(int i=0; i<MAXVECTORS; i++) TestVectors[i] = '1;
       // read next files
-      $readmemh({pp, Tests[TestNum]}, TestVectors);
+      $readmemh({`PATH, Tests[TestNum]}, TestVectors);
       // set the vector index back to 0
       VectorNum = 0;
       // incemet the operation if all the rounding modes have been tested
diff --git a/testbench/tests_fp.vh b/testbench/tests_fp.vh
index 03d4707b8..4c0e9cda5 100644
--- a/testbench/tests_fp.vh
+++ b/testbench/tests_fp.vh
@@ -24,6 +24,7 @@
 // and limitations under the License.
 ////////////////////////////////////////////////////////////////////////////////////////////////
 
+`define PATH "../../tests/fp/vectors/"
 `define ADD_OPCTRL     3'b110
 `define MUL_OPCTRL     3'b100
 `define SUB_OPCTRL     3'b111