diff --git a/compiler/tests/01_library_drc_test.py b/compiler/tests/01_library_drc_test.py
index ad8671d2..42fa1335 100755
--- a/compiler/tests/01_library_drc_test.py
+++ b/compiler/tests/01_library_drc_test.py
@@ -42,11 +42,13 @@ def setup_files():
     files = os.listdir(gds_dir)
     nametest = re.compile("\.gds$", re.IGNORECASE)
     gds_files = list(filter(nametest.search, files))
-    import tech
-    if tech.blackbox_bitcell:
-        # Ignore DRC of all bitcells
-        nametest = re.compile("cell", re.IGNORECASE)
-        gds_files = list(filter(lambda v: not nametest.search(v), gds_files))
+    
+    try:
+        from tech import blackbox_cells
+        gds_files = list(set(gds_files) - set(blackbox_cells))
+    except ImportError:
+        pass
+    
     return (gds_dir, gds_files)
 
 
diff --git a/compiler/tests/02_library_lvs_test.py b/compiler/tests/02_library_lvs_test.py
index 5f53753b..35ac5d76 100755
--- a/compiler/tests/02_library_lvs_test.py
+++ b/compiler/tests/02_library_lvs_test.py
@@ -62,8 +62,13 @@ def setup_files():
         tempnames[i] = re.sub('\.gds$', '', tempnames[i])
         tempnames[i] = re.sub('\.sp$', '', tempnames[i])
 
-    # remove duplicate base names
-    nameset = set(tempnames)
+    try:
+        from tech import blackbox_cells
+        nameset = list(set(tempnames) - set(blackbox_cells))
+    except ImportError:
+        # remove duplicate base names
+        nameset = set(tempnames)
+
     allnames = list(nameset)
 
     return (gds_dir, sp_dir, allnames)