diff --git a/compiler/tests/23_lib_sram_model_corners_test.py b/compiler/tests/23_lib_sram_model_corners_test.py
index 744bf4ed..8b830832 100755
--- a/compiler/tests/23_lib_sram_model_corners_test.py
+++ b/compiler/tests/23_lib_sram_model_corners_test.py
@@ -9,7 +9,6 @@ import sys,os,re
 sys.path.append(os.path.join(sys.path[0],".."))
 import globals
 from globals import OPTS
-from sram_factory import factory
 import debug
 
 class model_corners_lib_test(openram_test):
@@ -18,6 +17,7 @@ class model_corners_lib_test(openram_test):
         globals.init_openram("config_20_{0}".format(OPTS.tech_name))
 
         from characterizer import lib
+        from sram import sram
         from sram_config import sram_config
         c = sram_config(word_size=2,
                         num_words=16,
@@ -25,8 +25,10 @@ class model_corners_lib_test(openram_test):
         c.words_per_row=1
         c.recompute_sizes()
         debug.info(1, "Testing analytical timing for sample 2 bit, 16 words SRAM with 1 bank")
-        
-        s = factory.create(module_type="sram", sram_config=c, name="sram_2_16_1_{0}".format(OPTS.tech_name))
+
+        # This doesn't have to use the factory since worst case
+        # it will just replaece the top-level module of the same name
+        s = sram(c, name="sram", name="sram_2_16_1_{0}".format(OPTS.tech_name))
         tempspice = OPTS.openram_temp + "temp.sp"
         s.sp_write(tempspice)
 
diff --git a/compiler/tests/23_lib_sram_model_test.py b/compiler/tests/23_lib_sram_model_test.py
index 518943a1..0b4a17b0 100755
--- a/compiler/tests/23_lib_sram_model_test.py
+++ b/compiler/tests/23_lib_sram_model_test.py
@@ -9,7 +9,6 @@ import sys,os,re
 sys.path.append(os.path.join(sys.path[0],".."))
 import globals
 from globals import OPTS
-from sram_factory import factory
 import debug
 
 class lib_test(openram_test):
@@ -18,6 +17,7 @@ class lib_test(openram_test):
         globals.init_openram("config_20_{0}".format(OPTS.tech_name))
 
         from characterizer import lib
+        from sram import sram
         from sram_config import sram_config
         c = sram_config(word_size=2,
                         num_words=16,
@@ -26,7 +26,9 @@ class lib_test(openram_test):
         c.recompute_sizes()
         debug.info(1, "Testing analytical timing for sample 2 bit, 16 words SRAM with 1 bank")
 
-        s = factory.create(module_type="sram", sram_config=c, name="sram_2_16_1_{0}".format(OPTS.tech_name))
+        # This doesn't have to use the factory since worst case
+        # it will just replaece the top-level module of the same name
+        s = sram(c, "sram_2_16_1_{0}".format(OPTS.tech_name))
         tempspice = OPTS.openram_temp + "temp.sp"
         s.sp_write(tempspice)
 
diff --git a/compiler/tests/23_lib_sram_prune_test.py b/compiler/tests/23_lib_sram_prune_test.py
index 2280ac79..f8666d6f 100755
--- a/compiler/tests/23_lib_sram_prune_test.py
+++ b/compiler/tests/23_lib_sram_prune_test.py
@@ -9,7 +9,6 @@ import sys,os,re
 sys.path.append(os.path.join(sys.path[0],".."))
 import globals
 from globals import OPTS
-from sram_factory import factory
 import debug
 
 class lib_test(openram_test):
@@ -27,6 +26,7 @@ class lib_test(openram_test):
         if not OPTS.spice_exe:
             debug.error("Could not find {} simulator.".format(OPTS.spice_name),-1)
 
+        from sram import sram
         from sram_config import sram_config
         c = sram_config(word_size=2,
                         num_words=16,
@@ -35,7 +35,9 @@ class lib_test(openram_test):
         c.recompute_sizes()
         debug.info(1, "Testing pruned timing for sample 2 bit, 16 words SRAM with 1 bank")
 
-        s = factory.create(module_type="sram", sram_config=c, name="sram_2_16_1_{0}".format(OPTS.tech_name))
+        # This doesn't have to use the factory since worst case
+        # it will just replaece the top-level module of the same name
+        s = sram(c, "sram_2_16_1_{0}".format(OPTS.tech_name))
 
         tempspice = OPTS.openram_temp + "temp.sp"
         s.sp_write(tempspice)
diff --git a/compiler/tests/23_lib_sram_test.py b/compiler/tests/23_lib_sram_test.py
index 1cd142bf..6cddd840 100755
--- a/compiler/tests/23_lib_sram_test.py
+++ b/compiler/tests/23_lib_sram_test.py
@@ -9,7 +9,6 @@ import sys,os,re
 sys.path.append(os.path.join(sys.path[0],".."))
 import globals
 from globals import OPTS
-from sram_factory import factory
 import debug
 
 class lib_test(openram_test):
@@ -27,6 +26,7 @@ class lib_test(openram_test):
         if not OPTS.spice_exe:
             debug.error("Could not find {} simulator.".format(OPTS.spice_name),-1)
 
+        from sram import sram
         from sram_config import sram_config
         c = sram_config(word_size=2,
                         num_words=16,
@@ -35,7 +35,9 @@ class lib_test(openram_test):
         c.recompute_sizes()
         debug.info(1, "Testing timing for sample 2 bit, 16 words SRAM with 1 bank")
 
-        s = factory.create(module_type="sram", sram_config=c, name="sram_2_16_1_{0}".format(OPTS.tech_name))
+        # This doesn't have to use the factory since worst case
+        # it will just replaece the top-level module of the same name
+        s = sram(c, "sram_2_16_1_{0}".format(OPTS.tech_name))
 
         tempspice = OPTS.openram_temp + "temp.sp"
         s.sp_write(tempspice)