diff --git a/compiler/characterizer/delay.py b/compiler/characterizer/delay.py
index 7e210acd..89bf3be6 100644
--- a/compiler/characterizer/delay.py
+++ b/compiler/characterizer/delay.py
@@ -263,22 +263,9 @@ class delay():
         # run until the last cycle time
         end_time = self.cycle_times[-1]
         self.sf.write(".TRAN 5p {0}n\n".format(end_time))
-
-        if OPTS.spice_version == "hspice":
-            # create plots for all signals
-            self.sf.write(".OPTIONS POST=1 PROBE\n")
-            self.sf.write(".probe V(*)\n")
-            # end the stimulus file
-            self.sf.write(".end\n")
-            self.sf.close()
-        else:
-            pass
-            # This is only needed for ngspice <26
-            # self.sf.write(".control\n")
-            # self.sf.write("run\n")
-            # self.sf.write("quit\n")
-            # self.sf.write(".endc\n")
-
+        self.sf.write(".OPTIONS POST=1 PROBE\n")
+        # create plots for all signals
+        self.sf.write(".probe V(*)\n")
         # end the stimulus file
         self.sf.write(".end\n")
 
diff --git a/compiler/characterizer/setup_hold.py b/compiler/characterizer/setup_hold.py
index a895b2ad..999a3a95 100644
--- a/compiler/characterizer/setup_hold.py
+++ b/compiler/characterizer/setup_hold.py
@@ -167,18 +167,8 @@ class setup_hold():
         end_time = 2 * period
         self.sf.write(".TRAN 5p {0}n\n".format(end_time))
         self.sf.write(".OPTIONS POST=1 PROBE\n")
-
-        if OPTS.spice_version == "hspice":
-            self.sf.write(".probe V(*)\n")
-        else:
-            pass
-            # This is only needed for ngspice <26
-            # self.sf.write(".control\n")
-            # self.sf.write("run\n")
-            # self.sf.write("* plot clk_buf data_buf doutrun\n")
-            # self.sf.write("quit\n")
-            # self.sf.write(".endc\n")
-
+        # create plots for all signals
+        self.sf.write(".probe V(*)\n")
         # end the stimulus file
         self.sf.write(".end\n")
 
diff --git a/compiler/tests/21_ngspice_delay_test.py b/compiler/tests/21_ngspice_delay_test.py
index 5759cf71..f67233b4 100644
--- a/compiler/tests/21_ngspice_delay_test.py
+++ b/compiler/tests/21_ngspice_delay_test.py
@@ -13,7 +13,7 @@ import calibre
 
 OPTS = globals.get_opts()
 
-@unittest.skip("SKIPPING 21_ngspice_delay_test")
+#@unittest.skip("SKIPPING 21_ngspice_delay_test")
 class timing_sram_test(unittest.TestCase):
 
     def runTest(self):
@@ -53,7 +53,7 @@ class timing_sram_test(unittest.TestCase):
             self.assertTrue(isclose(data['min_period1'],0.078582763671875))
             self.assertTrue(isclose(data['min_period0'],0.25543212890625))
         elif OPTS.tech_name == "scn3me_subm":
-            self.assertTrue(isclose(data['delay1'],1.618362))
+            self.assertTrue(isclose(data['delay1'],1.66442871094)) # diff than hspice
             self.assertTrue(isclose(data['delay0'],2.2635000000000005))
             self.assertTrue(isclose(data['min_period1'],1.53564453125))
             self.assertTrue(isclose(data['min_period0'],2.998046875))