diff --git a/compiler/modules/wordline_driver.py b/compiler/modules/wordline_driver.py
index 709e3e45..87b0430e 100644
--- a/compiler/modules/wordline_driver.py
+++ b/compiler/modules/wordline_driver.py
@@ -58,6 +58,12 @@ class wordline_driver(design.design):
         
         self.nand2 = pnand2()
         self.add_mod(self.nand2)
+        
+        from importlib import reload
+        c = reload(__import__(OPTS.bitcell))
+        self.mod_bitcell = getattr(c, OPTS.bitcell)
+        self.bitcell = self.mod_bitcell()
+        self.add_mod(self.bitcell)
 
     def route_vdd_gnd(self):
         """ Add a pin for each row of vdd/gnd which are must-connects next level up. """
@@ -125,16 +131,20 @@ class wordline_driver(design.design):
         nand2_xoffset = inv1_xoffset + self.inv.width
         inv2_xoffset = nand2_xoffset + self.nand2.width
         
-        self.width = inv2_xoffset + self.inv.width
-        self.height = self.inv.height * self.rows
-
+        self.width = inv2_xoffset + self.inv.height
+        if self.bitcell.height > self.inv.height:
+            self.height = self.bitcell.height * self.rows
+            driver_height = self.bitcell.height
+        else:
+            self.height = self.inv.height * self.rows
+            driver_height = self.inv.height
         
         for row in range(self.rows):
             if (row % 2):
-                y_offset = self.inv.height*(row + 1)
+                y_offset = driver_height*(row + 1)
                 inst_mirror = "MX"
             else:
-                y_offset = self.inv.height*row
+                y_offset = driver_height*row
                 inst_mirror = "R0"
 
             inv1_offset = [inv1_xoffset, y_offset]
diff --git a/compiler/tests/08_wordline_driver_test.py b/compiler/tests/08_wordline_driver_test.py
old mode 100755
new mode 100644
index 9c91c7dd..1e0ae018
--- a/compiler/tests/08_wordline_driver_test.py
+++ b/compiler/tests/08_wordline_driver_test.py
@@ -20,10 +20,21 @@ class wordline_driver_test(openram_test):
         import wordline_driver
         import tech
 
+        # check wordline driver array in single port
         debug.info(2, "Checking driver")
         tx = wordline_driver.wordline_driver(rows=8)
         self.local_check(tx)
 
+        # check wordline driver array in multi-port
+        OPTS.bitcell = "pbitcell"
+        OPTS.rw_ports = 1
+        OPTS.w_ports = 0
+        OPTS.r_ports = 0
+        
+        debug.info(2, "Checking driver (multi-port case)")
+        tx = wordline_driver.wordline_driver(rows=8)
+        self.local_check(tx)
+
         globals.end_openram()
         
 # instantiate a copy of the class to actually run the test
diff --git a/compiler/tests/09_sense_amp_array_test.py b/compiler/tests/09_sense_amp_array_test.py
index ca07f884..a85a1ea3 100644
--- a/compiler/tests/09_sense_amp_array_test.py
+++ b/compiler/tests/09_sense_amp_array_test.py
@@ -29,14 +29,14 @@ class sense_amp_test(openram_test):
         # check sense amp array in multi-port
         OPTS.bitcell = "pbitcell"
         OPTS.rw_ports = 1
-        OPTS.w_ports = 1
-        OPTS.r_ports = 1
+        OPTS.w_ports = 0
+        OPTS.r_ports = 0
         
-        debug.info(2, "Testing sense_amp_array for word_size=4, words_per_row=2")
+        debug.info(2, "Testing sense_amp_array for word_size=4, words_per_row=2 (multi-port case)")
         a = sense_amp_array.sense_amp_array(word_size=4, words_per_row=2)
         self.local_check(a)
 
-        debug.info(2, "Testing sense_amp_array for word_size=4, words_per_row=4")
+        debug.info(2, "Testing sense_amp_array for word_size=4, words_per_row=4 (multi-port case)")
         a = sense_amp_array.sense_amp_array(word_size=4, words_per_row=4)
         self.local_check(a)
         
diff --git a/compiler/tests/10_write_driver_array_test.py b/compiler/tests/10_write_driver_array_test.py
index f4a484cc..9c68cf5f 100644
--- a/compiler/tests/10_write_driver_array_test.py
+++ b/compiler/tests/10_write_driver_array_test.py
@@ -29,18 +29,18 @@ class write_driver_test(openram_test):
         # check write driver array in multi-port
         OPTS.bitcell = "pbitcell"
         OPTS.rw_ports = 1
-        OPTS.w_ports = 1
-        OPTS.r_ports = 1
+        OPTS.w_ports = 0
+        OPTS.r_ports = 0
         
-        debug.info(2, "Testing write_driver_array for columns=8, word_size=8")
+        debug.info(2, "Testing write_driver_array for columns=8, word_size=8 (multi-port case)")
         a = write_driver_array.write_driver_array(columns=8, word_size=8)
         self.local_check(a)
 
-        debug.info(2, "Testing write_driver_array for columns=16, word_size=8")
+        debug.info(2, "Testing write_driver_array for columns=16, word_size=8 (multi-port case)")
         a = write_driver_array.write_driver_array(columns=16, word_size=8)
         self.local_check(a)
         
-        #globals.end_openram()
+        globals.end_openram()
 
 # instantiate a copy of the class to actually run the test
 if __name__ == "__main__":