diff --git a/boom/Makefile b/boom/Makefile
index f4f27e5..a43a091 100644
--- a/boom/Makefile
+++ b/boom/Makefile
@@ -1,7 +1,3 @@
-BOOM=PATH=/home/moko/svn.openmoko.org/trunk/eda/boom:../boom:$$PATH boom
-
-KITS = 1
-
 DIST = dk
 MANU = avx johanson murata panasonic stackpole tdk yageo
 
@@ -16,28 +12,12 @@ DB = $(EQU) $(INV) $(DSC) $(CHR) \
     $(DIST:%=dist/%/db/*.dsc)
 
 
-.PHONY:		all show again spotless tar count
+.PHONY:		all spotless tar count
 
 all:		show
 
-show:		test.ord $(DSC)
-		$(BOOM) prettyord -t $^
-
-again:
-		$(MAKE) spotless
-		$(MAKE) all
-
-test.ord:	test.par $(INV) $(EQU)
-		$(BOOM) part2order $(KITS) $^ >$@ || { rm -f $@; exit 1; }
-
-test.par:	$(EQU) $(INV) $(CHR) test.lst test.sub
-		$(BOOM) bom2part $^ >$@ || { rm -f $@; exit 1; }
-
-test.lst:	test.mbq
-		perl ./mbq2lst $^ >$@ || { rm -f $@; exit 1; }
 
 spotless:
-		rm -f test.lst test.par test.ord
 
 tar:
 		tar cfj boom-db.tar.bz2 $(DB)
diff --git a/boom/test/Makefile b/boom/test/Makefile
new file mode 100644
index 0000000..642c5aa
--- /dev/null
+++ b/boom/test/Makefile
@@ -0,0 +1,34 @@
+BOOM=PATH=/home/moko/svn.openmoko.org/trunk/eda/boom:../boom:$$PATH boom
+
+KITS = 1
+
+MANU = avx johanson murata panasonic stackpole tdk yageo
+
+EQU = ../dist/all.equ
+INV = ../dist/all.inv
+DSC = ../dist/all.dsc
+CHR = $(foreach m,$(MANU),../manu/$(m)/$(m).chr)
+
+
+.PHONY:		all show again spotless
+
+all:		show
+
+show:		test.ord $(DSC)
+		$(BOOM) prettyord -t $^
+
+again:
+		$(MAKE) spotless
+		$(MAKE) all
+
+test.ord:	test.par $(INV) $(EQU)
+		$(BOOM) part2order $(KITS) $^ >$@ || { rm -f $@; exit 1; }
+
+test.par:	$(EQU) $(INV) $(CHR) test.lst test.sub
+		$(BOOM) bom2part $^ >$@ || { rm -f $@; exit 1; }
+
+test.lst:	test.mbq
+		perl ../mbq2lst $^ >$@ || { rm -f $@; exit 1; }
+
+spotless:
+		rm -f test.lst test.par test.ord
diff --git a/boom/test.mbq b/boom/test/test.mbq
similarity index 100%
rename from boom/test.mbq
rename to boom/test/test.mbq
diff --git a/boom/test.sub b/boom/test/test.sub
similarity index 100%
rename from boom/test.sub
rename to boom/test/test.sub