diff --git a/compiler/router/tests/01_no_blockages_test.py b/compiler/router/tests/01_no_blockages_test.py
index c5694a8e..a5efebc4 100644
--- a/compiler/router/tests/01_no_blockages_test.py
+++ b/compiler/router/tests/01_no_blockages_test.py
@@ -56,8 +56,7 @@ class no_blockages_test(unittest.TestCase):
                 r.route(layer_stack,src="A",dest="B")
                 r.add_route(self)
 
-        
-        r = routing("test1", "01_no_blockages_test")
+        r = routing("test1", "01_no_blockages_test_{0}".format(OPTS.tech_name))
         self.local_check(r)
         
         # fails if there are any DRC errors on any cells
diff --git a/compiler/router/tests/01_no_blockages_test.gds b/compiler/router/tests/01_no_blockages_test_freepdk45.gds
similarity index 100%
rename from compiler/router/tests/01_no_blockages_test.gds
rename to compiler/router/tests/01_no_blockages_test_freepdk45.gds
diff --git a/compiler/router/tests/01_no_blockages_test_scn3me_subm.gds b/compiler/router/tests/01_no_blockages_test_scn3me_subm.gds
new file mode 100644
index 00000000..a94ec07c
Binary files /dev/null and b/compiler/router/tests/01_no_blockages_test_scn3me_subm.gds differ
diff --git a/compiler/router/tests/02_blockages_test.py b/compiler/router/tests/02_blockages_test.py
index d4bc7f6f..91734d6e 100644
--- a/compiler/router/tests/02_blockages_test.py
+++ b/compiler/router/tests/02_blockages_test.py
@@ -56,7 +56,7 @@ class blockages_test(unittest.TestCase):
                 r.route(layer_stack,src="A",dest="B")
                 r.add_route(self)                
                 
-        r = routing("test1", "02_blockages_test")
+        r = routing("test1", "02_blockages_test_{0}".format(OPTS.tech_name))
         self.local_check(r)
         
         # fails if there are any DRC errors on any cells
diff --git a/compiler/router/tests/02_blockages_test.gds b/compiler/router/tests/02_blockages_test_freepdk45.gds
similarity index 100%
rename from compiler/router/tests/02_blockages_test.gds
rename to compiler/router/tests/02_blockages_test_freepdk45.gds
diff --git a/compiler/router/tests/02_blockages_test_scn3me_subm.gds b/compiler/router/tests/02_blockages_test_scn3me_subm.gds
new file mode 100644
index 00000000..f9407ee4
Binary files /dev/null and b/compiler/router/tests/02_blockages_test_scn3me_subm.gds differ
diff --git a/compiler/router/tests/03_same_layer_pins_test.py b/compiler/router/tests/03_same_layer_pins_test.py
index a85c99b0..fdff815a 100644
--- a/compiler/router/tests/03_same_layer_pins_test.py
+++ b/compiler/router/tests/03_same_layer_pins_test.py
@@ -55,7 +55,7 @@ class same_layer_pins_test(unittest.TestCase):
                 r.route(layer_stack,src="A",dest="B")
                 r.add_route(self)
         
-        r = routing("test1", "03_same_layer_pins_test")
+        r = routing("test1", "03_same_layer_pins_test_{0}".format(OPTS.tech_name))
         self.local_check(r)
         
         
diff --git a/compiler/router/tests/03_same_layer_pins_test.gds b/compiler/router/tests/03_same_layer_pins_test_freepdk45.gds
similarity index 100%
rename from compiler/router/tests/03_same_layer_pins_test.gds
rename to compiler/router/tests/03_same_layer_pins_test_freepdk45.gds
diff --git a/compiler/router/tests/03_same_layer_pins_test_scn3me_subm.gds b/compiler/router/tests/03_same_layer_pins_test_scn3me_subm.gds
new file mode 100644
index 00000000..ede8a97f
Binary files /dev/null and b/compiler/router/tests/03_same_layer_pins_test_scn3me_subm.gds differ
diff --git a/compiler/router/tests/04_diff_layer_pins_test.py b/compiler/router/tests/04_diff_layer_pins_test.py
index d391eb96..6ce2f30a 100644
--- a/compiler/router/tests/04_diff_layer_pins_test.py
+++ b/compiler/router/tests/04_diff_layer_pins_test.py
@@ -57,9 +57,7 @@ class diff_layer_pins_test(unittest.TestCase):
                 r.route(layer_stack,src="A",dest="B")
                 r.add_route(self)
 
-        
-        
-        r = routing("test1", "04_diff_layer_pins_test")
+        r = routing("test1", "04_diff_layer_pins_test_{0}".format(OPTS.tech_name))
         self.local_check(r)
         
         # fails if there are any DRC errors on any cells
diff --git a/compiler/router/tests/04_diff_layer_pins_test.gds b/compiler/router/tests/04_diff_layer_pins_test_freepdk45.gds
similarity index 100%
rename from compiler/router/tests/04_diff_layer_pins_test.gds
rename to compiler/router/tests/04_diff_layer_pins_test_freepdk45.gds
diff --git a/compiler/router/tests/04_diff_layer_pins_test_scn3me_subm.gds b/compiler/router/tests/04_diff_layer_pins_test_scn3me_subm.gds
new file mode 100644
index 00000000..56e250c4
Binary files /dev/null and b/compiler/router/tests/04_diff_layer_pins_test_scn3me_subm.gds differ
diff --git a/compiler/router/tests/05_two_nets_test.py b/compiler/router/tests/05_two_nets_test.py
index f4dc9526..d9120465 100644
--- a/compiler/router/tests/05_two_nets_test.py
+++ b/compiler/router/tests/05_two_nets_test.py
@@ -62,7 +62,7 @@ class two_nets_test(unittest.TestCase):
 
 
         
-        r = routing("test1", "05_two_nets_test")
+        r = routing("test1", "05_two_nets_test_{0}".format(OPTS.tech_name))
         self.local_check(r)
         
         # fails if there are any DRC errors on any cells
diff --git a/compiler/router/tests/05_two_nets_test.gds b/compiler/router/tests/05_two_nets_test_freepdk45.gds
similarity index 100%
rename from compiler/router/tests/05_two_nets_test.gds
rename to compiler/router/tests/05_two_nets_test_freepdk45.gds
diff --git a/compiler/router/tests/05_two_nets_test_scn3me_subm.gds b/compiler/router/tests/05_two_nets_test_scn3me_subm.gds
new file mode 100644
index 00000000..03d837c6
Binary files /dev/null and b/compiler/router/tests/05_two_nets_test_scn3me_subm.gds differ
diff --git a/compiler/router/tests/06_pin_location_test.py b/compiler/router/tests/06_pin_location_test.py
index 69a43d58..4ba9a81c 100644
--- a/compiler/router/tests/06_pin_location_test.py
+++ b/compiler/router/tests/06_pin_location_test.py
@@ -60,9 +60,12 @@ class pin_location_test(unittest.TestCase):
                 #r.route(layer_stack,src="A",dest="B")
                 r.add_route(self)
 
-        
-        r = routing("test1", "01_no_blockages_test")
-        self.local_check(r)
+        # This only works for freepdk45 since the coordinates are hard coded
+        if OPTS.tech_name == "freepdk45":
+            r = routing("test1", "06_pin_location_test_{0}".format(OPTS.tech_name))
+            self.local_check(r)
+        else:
+            debug.warning("This test does not support technology {0}".format(OPTS.tech_name))
         
         # fails if there are any DRC errors on any cells
         globals.end_openram()
diff --git a/compiler/router/tests/06_pin_location_test_freepdk45.gds b/compiler/router/tests/06_pin_location_test_freepdk45.gds
new file mode 100644
index 00000000..cbad1838
Binary files /dev/null and b/compiler/router/tests/06_pin_location_test_freepdk45.gds differ
diff --git a/compiler/router/tests/06_pin_location_test_scn3me_subm.gds b/compiler/router/tests/06_pin_location_test_scn3me_subm.gds
new file mode 100644
index 00000000..cbad1838
Binary files /dev/null and b/compiler/router/tests/06_pin_location_test_scn3me_subm.gds differ
diff --git a/compiler/router/tests/07_big_scmos_test.py b/compiler/router/tests/07_big_test.py
similarity index 91%
rename from compiler/router/tests/07_big_scmos_test.py
rename to compiler/router/tests/07_big_test.py
index 83086327..46f5ffa9 100644
--- a/compiler/router/tests/07_big_scmos_test.py
+++ b/compiler/router/tests/07_big_test.py
@@ -12,7 +12,7 @@ import calibre
 
 OPTS = globals.OPTS
 
-class big_scmos_test(unittest.TestCase):
+class big_test(unittest.TestCase):
     """
     Simplest two pin route test with no blockages using the pin locations instead of labels.
     """
@@ -58,11 +58,12 @@ class big_scmos_test(unittest.TestCase):
                 r.route(layer_stack,src="A",dest="B")
                 r.add_route(self)
 
+        # This test only runs on scn3me_subm tech
         if OPTS.tech_name=="scn3me_subm":
-            r = routing("test1", "07_big_scmos_test")
+            r = routing("test1", "07_big_test_{0}".format(OPTS.tech_name))
             self.local_check(r)
         else:
-            debug.warning("Test must be run in scn3me_subm")
+            debug.warning("This test does not support technology {0}".format(OPTS.tech_name))
                 
         # fails if there are any DRC errors on any cells
         globals.end_openram()
diff --git a/compiler/router/tests/07_big_scmos_test.gds b/compiler/router/tests/07_big_test_scn3me_subm.gds
similarity index 100%
rename from compiler/router/tests/07_big_scmos_test.gds
rename to compiler/router/tests/07_big_test_scn3me_subm.gds