diff --git a/compiler/tests/21_hspice_delay_test.py b/compiler/tests/21_hspice_delay_test.py
index 46693e9f..74db4757 100755
--- a/compiler/tests/21_hspice_delay_test.py
+++ b/compiler/tests/21_hspice_delay_test.py
@@ -54,7 +54,7 @@ class timing_sram_test(openram_test):
         if OPTS.tech_name == "freepdk45":
             golden_data = {'delay_hl0': [2.5829000000000004],
                             'delay_lh0': [0.2255964],
-                            'leakage_power0': 0.0019498999999999996,
+                            'leakage_power': 0.0019498999999999996,
                             'min_period': 4.844,
                             'read0_power0': [0.055371399999999994],
                             'read1_power0': [0.0520225],
diff --git a/compiler/tests/21_ngspice_delay_test.py b/compiler/tests/21_ngspice_delay_test.py
index d54cdf54..ca873339 100755
--- a/compiler/tests/21_ngspice_delay_test.py
+++ b/compiler/tests/21_ngspice_delay_test.py
@@ -51,27 +51,27 @@ class timing_sram_test(openram_test):
         data = d.analyze(probe_address, probe_data, slews, loads)
 
         if OPTS.tech_name == "freepdk45":
-            golden_data = {'delay_hl': [2.584251],
-                            'delay_lh': [0.22870469999999998],
+            golden_data = {'delay_hl0': [2.584251],
+                            'delay_lh0': [0.22870469999999998],
                             'leakage_power': 0.0009567935,
                             'min_period': 4.844,
-                            'read0_power': [0.0547588],
-                            'read1_power': [0.051159970000000006],
-                            'slew_hl': [0.08164099999999999],
-                            'slew_lh': [0.025474979999999998],
-                            'write0_power': [0.06513271999999999],
-                            'write1_power': [0.058057000000000004]}
+                            'read0_power0': [0.0547588],
+                            'read1_power0': [0.051159970000000006],
+                            'slew_hl0': [0.08164099999999999],
+                            'slew_lh0': [0.025474979999999998],
+                            'write0_power0': [0.06513271999999999],
+                            'write1_power0': [0.058057000000000004]}
         elif OPTS.tech_name == "scn3me_subm":
-            golden_data = {'delay_hl': [4.221382999999999],
-                            'delay_lh': [2.6459520000000003],
+            golden_data = {'delay_hl0': [4.221382999999999],
+                            'delay_lh0': [2.6459520000000003],
                             'leakage_power': 0.0013865260000000001,
                             'min_period': 4.688,
-                            'read0_power': [26.699669999999998],
-                            'read1_power': [26.13123],
-                            'slew_hl': [0.9821776000000001],
-                            'slew_lh': [1.5791520000000001],
-                            'write0_power': [30.71939],
-                            'write1_power': [27.44753]}
+                            'read0_power0': [26.699669999999998],
+                            'read1_power0': [26.13123],
+                            'slew_hl0': [0.9821776000000001],
+                            'slew_lh0': [1.5791520000000001],
+                            'write0_power0': [30.71939],
+                            'write1_power0': [27.44753]}
         else:
             self.assertTrue(False) # other techs fail