diff --git a/compiler/tests/20_sram_1bank_16mux_test.py b/compiler/tests/20_sram_1bank_16mux_test.py
index 66d13869..61f469e4 100755
--- a/compiler/tests/20_sram_1bank_16mux_test.py
+++ b/compiler/tests/20_sram_1bank_16mux_test.py
@@ -22,9 +22,19 @@ class sram_1bank_8mux_test(openram_test):
         config_file = "{}/tests/configs/config".format(os.getenv("OPENRAM_HOME"))
         globals.init_openram(config_file)
         from sram_config import sram_config
+
+        if OPTS.tech_name == "sky130":
+            num_spare_rows = 1
+            num_spare_cols = 1
+        else:
+            num_spare_rows = 0
+            num_spare_cols = 0
+
         c = sram_config(word_size=2,
                         num_words=256,
-                        num_banks=1)
+                        num_banks=1,
+                        num_spare_cols=num_spare_cols,
+                        num_spare_rows=num_spare_rows)
 
         c.words_per_row=16
         c.recompute_sizes()
diff --git a/compiler/tests/20_sram_1bank_2mux_global_test.py b/compiler/tests/20_sram_1bank_2mux_global_test.py
index 11f084ec..ec207564 100755
--- a/compiler/tests/20_sram_1bank_2mux_global_test.py
+++ b/compiler/tests/20_sram_1bank_2mux_global_test.py
@@ -23,9 +23,19 @@ class sram_1bank_2mux_global_test(openram_test):
         globals.init_openram(config_file)
         from sram_config import sram_config
         OPTS.local_array_size = 8
+
+        if OPTS.tech_name == "sky130":
+            num_spare_rows = 1
+            num_spare_cols = 1
+        else:
+            num_spare_rows = 0
+            num_spare_cols = 0
+
         c = sram_config(word_size=8,
                         num_words=32,
-                        num_banks=1)
+                        num_banks=1,
+                        num_spare_cols=num_spare_cols,
+                        num_spare_rows=num_spare_rows)
 
         c.words_per_row=2
         c.recompute_sizes()
diff --git a/compiler/tests/20_sram_1bank_2mux_test.py b/compiler/tests/20_sram_1bank_2mux_test.py
index d7240cac..045eccec 100755
--- a/compiler/tests/20_sram_1bank_2mux_test.py
+++ b/compiler/tests/20_sram_1bank_2mux_test.py
@@ -22,9 +22,19 @@ class sram_1bank_2mux_test(openram_test):
         config_file = "{}/tests/configs/config".format(os.getenv("OPENRAM_HOME"))
         globals.init_openram(config_file)
         from sram_config import sram_config
+
+        if OPTS.tech_name == "sky130":
+            num_spare_rows = 1
+            num_spare_cols = 1
+        else:
+            num_spare_rows = 0
+            num_spare_cols = 0
+
         c = sram_config(word_size=4,
                         num_words=32,
-                        num_banks=1)
+                        num_banks=1,
+                        num_spare_cols=num_spare_cols,
+                        num_spare_rows=num_spare_rows)
 
         c.words_per_row=2
         c.recompute_sizes()
diff --git a/compiler/tests/20_sram_1bank_2mux_wmask_spare_cols_test.py b/compiler/tests/20_sram_1bank_2mux_wmask_spare_cols_test.py
index 0e0b99e6..0472793c 100755
--- a/compiler/tests/20_sram_1bank_2mux_wmask_spare_cols_test.py
+++ b/compiler/tests/20_sram_1bank_2mux_wmask_spare_cols_test.py
@@ -22,11 +22,20 @@ class sram_1bank_2mux_wmask_spare_cols_test(openram_test):
         config_file = "{}/tests/configs/config".format(os.getenv("OPENRAM_HOME"))
         globals.init_openram(config_file)
         from sram_config import sram_config
+
+        if OPTS.tech_name == "sky130":
+            num_spare_rows = 1
+            num_spare_cols = 1
+        else:
+            num_spare_rows = 0
+            num_spare_cols = 0
+
         c = sram_config(word_size=8,
                         write_size=4,
-                        num_spare_cols=3,
                         num_words=64,
-                        num_banks=1)
+                        num_banks=1,
+                        num_spare_cols=num_spare_cols+2,
+                        num_spare_rows=num_spare_rows)
 
         c.words_per_row = 2
         c.recompute_sizes()
diff --git a/compiler/tests/20_sram_1bank_2mux_wmask_test.py b/compiler/tests/20_sram_1bank_2mux_wmask_test.py
index a1ef171d..65c0f399 100755
--- a/compiler/tests/20_sram_1bank_2mux_wmask_test.py
+++ b/compiler/tests/20_sram_1bank_2mux_wmask_test.py
@@ -22,10 +22,20 @@ class sram_1bank_2mux_wmask_test(openram_test):
         config_file = "{}/tests/configs/config".format(os.getenv("OPENRAM_HOME"))
         globals.init_openram(config_file)
         from sram_config import sram_config
+
+        if OPTS.tech_name == "sky130":
+            num_spare_rows = 1
+            num_spare_cols = 1
+        else:
+            num_spare_rows = 0
+            num_spare_cols = 0
+
         c = sram_config(word_size=8,
                         write_size=4,
                         num_words=64,
-                        num_banks=1)
+                        num_banks=1,
+                        num_spare_cols=num_spare_cols,
+                        num_spare_rows=num_spare_rows)
 
         c.words_per_row = 2
         c.recompute_sizes()
diff --git a/compiler/tests/20_sram_1bank_32b_1024_wmask_test.py b/compiler/tests/20_sram_1bank_32b_1024_wmask_test.py
index 8631ef57..4a52c385 100755
--- a/compiler/tests/20_sram_1bank_32b_1024_wmask_test.py
+++ b/compiler/tests/20_sram_1bank_32b_1024_wmask_test.py
@@ -23,10 +23,20 @@ class sram_1bank_32b_1024_wmask_test(openram_test):
         config_file = "{}/tests/configs/config".format(os.getenv("OPENRAM_HOME"))
         globals.init_openram(config_file)
         from sram_config import sram_config
+
+        if OPTS.tech_name == "sky130":
+            num_spare_rows = 1
+            num_spare_cols = 1
+        else:
+            num_spare_rows = 0
+            num_spare_cols = 0
+
         c = sram_config(word_size=32,
                         write_size=8,
                         num_words=1024,
-                        num_banks=1)
+                        num_banks=1,
+                        num_spare_cols=num_spare_cols,
+                        num_spare_rows=num_spare_rows)
 
         c.recompute_sizes()
         debug.info(1, "Layout test for {}rw,{}r,{}w sram "
diff --git a/compiler/tests/20_sram_1bank_4mux_test.py b/compiler/tests/20_sram_1bank_4mux_test.py
index 70be4900..6f87fe44 100755
--- a/compiler/tests/20_sram_1bank_4mux_test.py
+++ b/compiler/tests/20_sram_1bank_4mux_test.py
@@ -22,9 +22,19 @@ class sram_1bank_4mux_test(openram_test):
         config_file = "{}/tests/configs/config".format(os.getenv("OPENRAM_HOME"))
         globals.init_openram(config_file)
         from sram_config import sram_config
+
+        if OPTS.tech_name == "sky130":
+            num_spare_rows = 1
+            num_spare_cols = 1
+        else:
+            num_spare_rows = 0
+            num_spare_cols = 0
+
         c = sram_config(word_size=4,
                         num_words=64,
-                        num_banks=1)
+                        num_banks=1,
+                        num_spare_cols=num_spare_cols,
+                        num_spare_rows=num_spare_rows)
 
         c.words_per_row=4
         c.recompute_sizes()
diff --git a/compiler/tests/20_sram_1bank_8mux_test.py b/compiler/tests/20_sram_1bank_8mux_test.py
index 6910a1c8..dc4ad5ec 100755
--- a/compiler/tests/20_sram_1bank_8mux_test.py
+++ b/compiler/tests/20_sram_1bank_8mux_test.py
@@ -22,9 +22,19 @@ class sram_1bank_8mux_test(openram_test):
         config_file = "{}/tests/configs/config".format(os.getenv("OPENRAM_HOME"))
         globals.init_openram(config_file)
         from sram_config import sram_config
+
+        if OPTS.tech_name == "sky130":
+            num_spare_rows = 1
+            num_spare_cols = 1
+        else:
+            num_spare_rows = 0
+            num_spare_cols = 0
+
         c = sram_config(word_size=2,
                         num_words=128,
-                        num_banks=1)
+                        num_banks=1,
+                        num_spare_cols=num_spare_cols,
+                        num_spare_rows=num_spare_rows)
 
         c.words_per_row=8
         c.recompute_sizes()
diff --git a/compiler/tests/20_sram_1bank_nomux_spare_cols_test.py b/compiler/tests/20_sram_1bank_nomux_spare_cols_test.py
index bd9645e3..d2b5da52 100755
--- a/compiler/tests/20_sram_1bank_nomux_spare_cols_test.py
+++ b/compiler/tests/20_sram_1bank_nomux_spare_cols_test.py
@@ -22,10 +22,19 @@ class sram_1bank_nomux_spare_cols_test(openram_test):
         config_file = "{}/tests/configs/config".format(os.getenv("OPENRAM_HOME"))
         globals.init_openram(config_file)
         from sram_config import sram_config
+
+        if OPTS.tech_name == "sky130":
+            num_spare_rows = 1
+            num_spare_cols = 1
+        else:
+            num_spare_rows = 0
+            num_spare_cols = 0
+
         c = sram_config(word_size=8,
-                        num_spare_cols=3,
                         num_words=16,
-                        num_banks=1)
+                        num_banks=1,
+                        num_spare_cols=num_spare_cols+2,
+                        num_spare_rows=num_spare_rows)
 
         c.words_per_row = 1
         c.recompute_sizes()
diff --git a/compiler/tests/20_sram_1bank_nomux_wmask_sparecols_test.py b/compiler/tests/20_sram_1bank_nomux_wmask_sparecols_test.py
index ca6361b8..f115a9b0 100755
--- a/compiler/tests/20_sram_1bank_nomux_wmask_sparecols_test.py
+++ b/compiler/tests/20_sram_1bank_nomux_wmask_sparecols_test.py
@@ -23,11 +23,20 @@ class sram_1bank_nomux_wmask_sparecols_test(openram_test):
         config_file = "{}/tests/configs/config".format(os.getenv("OPENRAM_HOME"))
         globals.init_openram(config_file)
         from sram_config import sram_config
+
+        if OPTS.tech_name == "sky130":
+            num_spare_rows = 1
+            num_spare_cols = 1
+        else:
+            num_spare_rows = 0
+            num_spare_cols = 0
+
         c = sram_config(word_size=8,
                         write_size=4,
                         num_words=16,
-                        num_spare_cols=3,
-                        num_banks=1)
+                        num_banks=1,
+                        num_spare_cols=num_spare_cols+2,
+                        num_spare_rows=num_spare_rows)
 
         c.words_per_row = 1
         c.recompute_sizes()
diff --git a/compiler/tests/20_sram_1bank_nomux_wmask_test.py b/compiler/tests/20_sram_1bank_nomux_wmask_test.py
index 83dea577..8c012a60 100755
--- a/compiler/tests/20_sram_1bank_nomux_wmask_test.py
+++ b/compiler/tests/20_sram_1bank_nomux_wmask_test.py
@@ -22,10 +22,20 @@ class sram_1bank_nomux_wmask_test(openram_test):
         config_file = "{}/tests/configs/config".format(os.getenv("OPENRAM_HOME"))
         globals.init_openram(config_file)
         from sram_config import sram_config
+
+        if OPTS.tech_name == "sky130":
+            num_spare_rows = 1
+            num_spare_cols = 1
+        else:
+            num_spare_rows = 0
+            num_spare_cols = 0
+
         c = sram_config(word_size=8,
                         write_size=4,
                         num_words=16,
-                        num_banks=1)
+                        num_banks=1,
+                        num_spare_cols=num_spare_cols+2,
+                        num_spare_rows=num_spare_rows)
 
         c.words_per_row = 1
         c.recompute_sizes()