Index: trunk/tests/conf/Makefile
===================================================================
--- trunk/tests/conf/Makefile	(revision 7804)
+++ trunk/tests/conf/Makefile	(revision 7805)
@@ -44,6 +44,9 @@
 
 all: conftest
 
+ROOT=../..
+include $(ROOT)/Makefile.conf
+
 conftest: $(OBJS) $(LIB_3RD_OBJS) $(LIB_PCB_OBJS) $(LIB_PLUGIN_OBJS)
 	$(CC) $(LDFLAGS) $(OBJS) $(LIB_3RD_OBJS) $(LIB_PCB_OBJS) $(LIB_PLUGIN_OBJS) $(LDLIBS) -o conftest
 
@@ -58,4 +61,4 @@
 	cd tests && $(MAKE) all
 
 clean:
-	-rm conftest tests/*.out $(OBJS)
+	-$(SCCBOX) rm -f conftest tests/*.out $(OBJS)
Index: trunk/tests/pcb-printf/Makefile
===================================================================
--- trunk/tests/pcb-printf/Makefile	(revision 7804)
+++ trunk/tests/pcb-printf/Makefile	(revision 7805)
@@ -9,6 +9,9 @@
 
 all: tester_spd prcli
 
+ROOT=../..
+include $(ROOT)/Makefile.conf
+
 test: tester.diff
 	@echo "pcb-printf:          *** QC PASS ***"
 	@rm tester.stdout ; true
@@ -43,5 +46,5 @@
 	$(CC) -c $(CFLAGS_OP) -DSPEED $(CFLAGS) -o $@ $(SRC)/pcb-printf.c
 
 clean:
-	-rm tester tester.o prcli prcli.o tester_spd tester_spd.o $(SRC)/pcb-printf_spd.o  2>/dev/null
+	-$(SCCBOX) rm -f tester tester.o prcli prcli.o tester_spd tester_spd.o $(SRC)/pcb-printf_spd.o
 
Index: trunk/tests/pcbflags/Makefile
===================================================================
--- trunk/tests/pcbflags/Makefile	(revision 7804)
+++ trunk/tests/pcbflags/Makefile	(revision 7805)
@@ -1,9 +1,12 @@
 all:
 
+ROOT=../..
+include $(ROOT)/Makefile.conf
+
 test:
 	@./test.sh && echo "pcbflags:            *** QC PASS ***"
 
 clean:
 	mv vanilla.pcb vanilla.save
-	-rm *.pcb *.log
+	-$(SCCBOX) rm -f *.pcb *.log
 	mv vanilla.save vanilla.pcb
Index: trunk/tests/propedit/Makefile
===================================================================
--- trunk/tests/propedit/Makefile	(revision 7804)
+++ trunk/tests/propedit/Makefile	(revision 7805)
@@ -17,6 +17,9 @@
 
 all: tester
 
+ROOT=../..
+include $(ROOT)/Makefile.conf
+
 test: tester.diff
 	@echo "propedit:            *** QC PASS ***"
 	@rm tester.out
@@ -35,4 +38,4 @@
 	./tester > tester.out
 
 clean:
-	-rm tester.out tester $(OBJS)
+	-$(SCCBOX) rm -f tester.out tester $(OBJS)
Index: trunk/tests/remote/Makefile
===================================================================
--- trunk/tests/remote/Makefile	(revision 7804)
+++ trunk/tests/remote/Makefile	(revision 7805)
@@ -4,6 +4,9 @@
 
 all: test_parse
 
+ROOT=../..
+include $(ROOT)/Makefile.conf
+
 test_parse: test_parse.o
 	$(CC) $(LDFLAGS) -o test_parse test_parse.o  $(LDLIBS)
 
@@ -13,4 +16,4 @@
 	@./test_all.sh
 
 clean:
-	-rm test_parse test_parse.o
+	-$(SCCBOX) rm -f test_parse test_parse.o
Index: trunk/tests/strflags/Makefile
===================================================================
--- trunk/tests/strflags/Makefile	(revision 7804)
+++ trunk/tests/strflags/Makefile	(revision 7805)
@@ -6,6 +6,9 @@
 
 all: tester
 
+ROOT=../..
+include $(ROOT)/Makefile.conf
+
 test: tester.diff
 	@echo "strflags:            *** QC PASS ***"
 	@rm tester.stdout
@@ -23,5 +26,5 @@
 	diff -u tester.ref tester.stdout
 
 clean:
-	rm tester tester.o 2>/dev/null ; true
+	-$(SCCBOX) rm -f tester tester.o
 
Index: trunk/tests/uniq_name/Makefile
===================================================================
--- trunk/tests/uniq_name/Makefile	(revision 7804)
+++ trunk/tests/uniq_name/Makefile	(revision 7805)
@@ -9,6 +9,9 @@
 
 all: tester
 
+ROOT=../..
+include $(ROOT)/Makefile.conf
+
 test: tester.diff
 	@echo "uniq_name:           *** QC PASS ***"
 	@rm tester.out
@@ -27,4 +30,4 @@
 	./tester > tester.out
 
 clean:
-	-rm tester.out tester tester.o
+	-$(SCCBOX) rm -f tester.out tester tester.o