diff --git a/openfpga/src/fpga_verilog/verilog_formal_random_top_testbench.cpp b/openfpga/src/fpga_verilog/verilog_formal_random_top_testbench.cpp
index 717efb21b..42bb7886f 100644
--- a/openfpga/src/fpga_verilog/verilog_formal_random_top_testbench.cpp
+++ b/openfpga/src/fpga_verilog/verilog_formal_random_top_testbench.cpp
@@ -363,6 +363,7 @@ void print_verilog_random_top_testbench(const std::string& circuit_name,
                                   std::string(BENCHMARK_PORT_POSTFIX),
                                   std::string(FPGA_PORT_POSTFIX),
                                   std::string(CHECKFLAG_PORT_POSTFIX),
+                                  std::string(),
                                   std::string(ERROR_COUNTER),
                                   atom_ctx,
                                   netlist_annotation, 
diff --git a/openfpga/src/fpga_verilog/verilog_testbench_utils.cpp b/openfpga/src/fpga_verilog/verilog_testbench_utils.cpp
index 78854ebc3..899d6b014 100644
--- a/openfpga/src/fpga_verilog/verilog_testbench_utils.cpp
+++ b/openfpga/src/fpga_verilog/verilog_testbench_utils.cpp
@@ -433,6 +433,7 @@ void print_verilog_testbench_check(std::fstream& fp,
                                    const std::string& benchmark_port_postfix,
                                    const std::string& fpga_port_postfix,
                                    const std::string& check_flag_port_postfix,
+                                   const std::string& config_done_name,
                                    const std::string& error_counter_name,
                                    const AtomContext& atom_ctx,
                                    const VprNetlistAnnotation& netlist_annotation,
@@ -465,7 +466,12 @@ void print_verilog_testbench_check(std::fstream& fp,
   fp << "\t\tif (1'b1 == " << generate_verilog_port(VERILOG_PORT_CONKT, sim_start_port) << ") begin" << std::endl;
   fp << "\t\t";
   print_verilog_register_connection(fp, sim_start_port, sim_start_port, true);
-  fp << "\t\tend else begin" << std::endl;
+  fp << "\t\tend else " << std::endl;
+  /* If there is a config done signal specified, consider it as a trigger on checking */
+  if (!config_done_name.empty()) {
+    fp << "if (1'b1 == " << config_done_name << ") "; 
+  }
+  fp << "begin" << std::endl;
 
   for (const AtomBlockId& atom_blk : atom_ctx.nlist.blocks()) {
     /* Bypass non-I/O atom blocks ! */
diff --git a/openfpga/src/fpga_verilog/verilog_testbench_utils.h b/openfpga/src/fpga_verilog/verilog_testbench_utils.h
index 3406b89b9..44816e85b 100644
--- a/openfpga/src/fpga_verilog/verilog_testbench_utils.h
+++ b/openfpga/src/fpga_verilog/verilog_testbench_utils.h
@@ -76,6 +76,7 @@ void print_verilog_testbench_check(std::fstream& fp,
                                    const std::string& benchmark_port_postfix,
                                    const std::string& fpga_port_postfix,
                                    const std::string& check_flag_port_postfix,
+                                   const std::string& config_done_name,
                                    const std::string& error_counter_name,
                                    const AtomContext& atom_ctx,
                                    const VprNetlistAnnotation& netlist_annotation,
diff --git a/openfpga/src/fpga_verilog/verilog_top_testbench.cpp b/openfpga/src/fpga_verilog/verilog_top_testbench.cpp
index d644c6a2b..d668cb997 100644
--- a/openfpga/src/fpga_verilog/verilog_top_testbench.cpp
+++ b/openfpga/src/fpga_verilog/verilog_top_testbench.cpp
@@ -2131,6 +2131,7 @@ int print_verilog_full_testbench(const ModuleManager& module_manager,
                                   std::string(TOP_TESTBENCH_REFERENCE_OUTPUT_POSTFIX),
                                   std::string(TOP_TESTBENCH_FPGA_OUTPUT_POSTFIX),
                                   std::string(TOP_TESTBENCH_CHECKFLAG_PORT_POSTFIX),
+                                  std::string(TOP_TB_CONFIG_DONE_PORT_NAME),
                                   std::string(TOP_TESTBENCH_ERROR_COUNTER),
                                   atom_ctx,
                                   netlist_annotation,