diff --git a/bin/tests/b8t.mk b/bin/tests/b8t.mk
index 5e108781b2..81412c5f0f 100644
--- a/bin/tests/b8t.mk
+++ b/bin/tests/b8t.mk
@@ -6,21 +6,28 @@
 MODULE	= bind
 BASE	= /build
 BDIR	= $(BASE)/$(MODULE)
-DDIR	= $(BASE)/$(MODULE)/dst
 RDIR	= /proj/build-reports/bind8/hosts/$(PLATFORM)
+SDIR	= $(HOME)/b8t/src
 CVSROOT	= /proj/cvs/isc
 
-all:	clobber checkout config build
+all:	clobber populate config build
 
 clobber:
-	@if test ! -d $(BASE) ; then mkdir -p $(BASE) ; fi 
 	@echo "CLOBBBER `date`"
-	@( cd $(BASE) && rm -fr $(MODULE) )
+	@if test ! -d $(BASE) ; then mkdir -p $(BASE) ; fi 
+	@rm -fr $(BDIR)
 	@echo "DONE `date`"
 
-checkout:
-	@echo "CHECKOUT `date`"
-	@( cd $(BASE) && cvs -d $(CVSROOT) checkout $(MODULE) )
+populate:
+	@echo "POPULATE `date`"
+	@( cd $(BASE) && tar -xvf $(SDIR)/$(MODULE).tar ) > $(RDIR)/.populate 2>&1
+	@echo "DONE `date`"
+
+tarsrc:
+	@echo "TARSRC `date`"
+	@rm -fr $(SDIR)/$(MODULE)
+	@( cd $(SDIR) && cvs -d $(CVSROOT) checkout $(MODULE) )
+	@( cd $(SDIR) && tar -cvf $(MODULE).tar $(MODULE) )
 	@echo "DONE `date`"
 
 config:
diff --git a/bin/tests/b9t.mk b/bin/tests/b9t.mk
index 2204896f0a..c75cf5d901 100644
--- a/bin/tests/b9t.mk
+++ b/bin/tests/b9t.mk
@@ -8,24 +8,25 @@
 BASE	= /build
 BDIR	= $(BASE)
 MODULE	= bind9
+SDIR	= $(HOME)/b9t/src
 
 # as it says
 CVSROOT	= /proj/cvs/isc
 
-# where the config, build and test output g oes
+# where the config, build and test output goes
 RDIR	= /proj/build-reports/$(MODULE)/hosts/$(PLATFORM)
 
-all:	clobber checkout config build test
+all:	clobber populate config build test
 
 clobber:
-	@if test ! -d $(BDIR) ; then mkdir -p $(BDIR) > /dev/null 2>&1 ; fi
 	@echo "CLOBBBER `date`"
-	( cd $(BDIR) && rm -fr $(MODULE) )
+	@if test ! -d $(BDIR) ; then mkdir -p $(BDIR) > /dev/null 2>&1 ; fi
+	@( cd $(BDIR) && rm -fr $(MODULE) )
 	@echo "DONE `date`"
 
-checkout:
-	@echo "CHECKOUT `date`"
-	@( cd $(BDIR) && cvs -d $(CVSROOT) checkout $(MODULE) )
+populate:
+	@echo "POPULATE `date`"
+	@( cd $(BDIR) && tar -xvf $(SDIR)/$(MODULE).tar ) > $(RDIR)/.populate 2>&1
 	@echo "DONE `date`"
 
 config:
@@ -43,3 +44,9 @@ test:
 	-@( cd $(BDIR)/$(MODULE)/bin/tests && $(MAKE) test ) > $(RDIR)/.test 2>&1
 	@echo "DONE `date`"
 
+tarsrc:
+	@echo "TARSRC `date`"
+	@rm -fr $(SDIR)/$(MODULE)
+	@( cd $(SDIR) && cvs -d $(CVSROOT) checkout $(MODULE) && tar -cvf $(MODULE).tar $(MODULE) )
+	@echo "DONE `date`"
+