diff --git a/compiler/tests/Makefile b/compiler/tests/Makefile
index 11c4c1f8..854f531d 100644
--- a/compiler/tests/Makefile
+++ b/compiler/tests/Makefile
@@ -16,29 +16,57 @@ TEST_STAMPS= $(addsuffix .ok,$(TEST_BASES))
 OPENRAM_DIR = /openram/compiler/tests
 RESULTS_DIR = $(OPENRAM_DIR)/results
 
-TEST_BROKEN = \
-	50_riscv_1k_1rw1r_func_test.py \
-	50_riscv_1k_1rw_func_test.py \
-	50_riscv_1rw1r_func_test.py \
-	50_riscv_1rw1r_phys_test.py \
-	50_riscv_1rw_func_test.py \
-	50_riscv_1rw_phys_test.py \
-	50_riscv_2k_1rw1r_func_test.py \
-	50_riscv_2k_1rw_func_test.py \
-	50_riscv_4k_1rw1r_func_test.py \
-	50_riscv_4k_1rw_func_test.py \
-	50_riscv_512b_1rw1r_func_test.py \
-	50_riscv_512b_1rw_func_test.py \
-	50_riscv_8k_1rw1r_func_test.py \
-	50_riscv_8k_1rw_func_test.py
-
-
-WORKING_TEST_STAMPS=$(filter-out $(addsuffix .ok, (TEST_BROKEN)), $(TEST_STAMPS))
-
+# Use % for all techs: 
+# %/test.py
+# or a specific tech:
+# freepdk45/test.py
+BROKEN_STAMPS = \
+	sky130/01_library_test.ok \
+	sky130/04_column_mux_pbitcell_test.ok \
+	sky130/04_dummy_pbitcell_test.ok \
+	sky130/04_pbitcell_test.ok \
+	sky130/04_pnand4_test.ok \
+	sky130/04_precharge_pbitcell_test.ok \
+	sky130/04_replica_pbitcell_test.ok \
+	sky130/05_pbitcell_array_test.ok \
+	sky130/05_bitcell_array_test.ok \
+	sky130/05_bitcell_array_1rw_1r_test.ok \
+	sky130/05_dummy_array_test.ok \
+	sky130/07_column_mux_array_pbitcell_test.ok \
+	sky130/19_pmulti_bank_test.ok \
+	sky130/19_psingle_bank_test.ok \
+	sky130/19_bank_select_pbitcell_test.ok \
+	sky130/20_psram_1bank_2mux_1rw_1w_test.ok \
+	sky130/20_psram_1bank_2mux_1rw_1w_wmask_test.ok \
+	sky130/20_psram_1bank_2mux_1w_1r_test.ok \
+	sky130/20_psram_1bank_2mux_test.ok \
+	sky130/20_psram_1bank_4mux_1rw_1r_test.ok \
+	sky130/22_psram_1bank_2mux_func_test.ok \
+	sky130/22_psram_1bank_4mux_func_test.ok \
+	sky130/22_psram_1bank_8mux_func_test.ok \
+	sky130/22_psram_1bank_nomux_func_test.ok \
+	%/50_riscv_1k_1rw1r_func_test.ok \
+	%/50_riscv_1k_1rw_func_test.ok \
+	%/50_riscv_1rw1r_func_test.ok \
+	%/50_riscv_1rw1r_phys_test.ok \
+	%/50_riscv_1rw_func_test.ok \
+	%/50_riscv_1rw_phys_test.ok \
+	%/50_riscv_2k_1rw1r_func_test.ok \
+	%/50_riscv_2k_1rw_func_test.ok \
+	%/50_riscv_4k_1rw1r_func_test.ok \
+	%/50_riscv_4k_1rw_func_test.ok \
+	%/50_riscv_512b_1rw1r_func_test.ok \
+	%/50_riscv_512b_1rw_func_test.ok \
+	%/50_riscv_8k_1rw1r_func_test.ok \
+	%/50_riscv_8k_1rw_func_test.ok
 
 gettech = $(word 1,$(subst /, ,$*))
 getfile = $(word 2,$(subst /, ,$*))
-WORKING_TECH_TEST_STAMPS=$(foreach T, $(TECHS),$(addprefix $T/,$(WORKING_TEST_STAMPS)))
+TECH_TEST_STAMPS=$(foreach T, $(TECHS), $(addprefix $T/, $(TEST_STAMPS)))
+
+# Filter out the tests after creating the tech stamps
+WORKING_TECH_TEST_STAMPS=$(filter-out $(BROKEN_STAMPS), $(TECH_TEST_STAMPS))
+
 
 # Run all technologies
 all: $(WORKING_TECH_TEST_STAMPS)
@@ -48,7 +76,7 @@ all: $(WORKING_TECH_TEST_STAMPS)
 # Run a given technology
 # e.g. make freepdk45
 $(ALL_TECHS):
-	@$(MAKE) --no-print-directory $(addprefix $@/,$(WORKING_TEST_STAMPS))
+	@$(MAKE) --no-print-directory $(filter-out $(BROKEN_STAMPS), $(addprefix $@/, $(TEST_STAMPS)))
 .PHONY: $(TECHS)
 
 # Targets for each individual test