diff --git a/mozilla/security/nss/tests/clean_tbx b/mozilla/security/nss/tests/clean_tbx
index 74d83de4fd6..4de955576ca 100755
--- a/mozilla/security/nss/tests/clean_tbx
+++ b/mozilla/security/nss/tests/clean_tbx
@@ -22,9 +22,9 @@ $PASSED_TBX_KEEP_HOURS=2;
 $IF_TBX_KEEP_HOURS=2;
 $PASSED_NEWER_DIRS=2;
 $IF_NEWER_DIRS=2;
-$verbose = 0;
+$verbose = 1;
 
-$TBX_TESTDIR="/share/builds/mccrel/nss/nsstip/tinderbox/tests_results/security";
+$TBX_TESTDIR="/share/builds/mccrel3/nss/nsstip/tinderbox/tests_results/security";
 $FTP_STAGE="/u/sonmi/tmp/ftp_stage/tinderbox";
 
 @tbx_dirs = ();  
@@ -34,7 +34,7 @@ $ePASSED_TBX_KEEP=$PASSED_TBX_KEEP_HOURS*60*60;
 $eIF_TBX_KEEP=$IF_TBX_KEEP_HOURS*60*60;
 $eNOT_FAILED_TBX_KEEP=$NOT_FAILED_TBX_KEEP_HOURS*60*60;
 
-$days, $hours, $minutes, $seconds;
+$year, $month, $days, $hours, $minutes, $seconds;
 $efulldate=0;
 
 $fulldate=0;
@@ -56,8 +56,6 @@ debug ("$seconds, $minutes, $hours, $days, $month, $year");
 
 $enow = timelocal(localtime);
 
-
-
 sub debug;
 sub warning;
 sub error;
@@ -65,7 +63,6 @@ sub msg;
 sub init;
 sub check_tbx_dirs;
 
-
 sub check_tbx_dirs
 {
     my $platform_idx=0; # counts directories per platform, newest 
@@ -141,6 +138,7 @@ sub rm_tbx()
 
 debug ("DELETING $tbx_dir... (@_[0]) ");
 system("rm -rf $TBX_TESTDIR/$tbx_dir");
+#debug ("rm -rf $TBX_TESTDIR/$tbx_dir");
 
 }
 
diff --git a/mozilla/security/nss/tests/header b/mozilla/security/nss/tests/header
index a0b2cc13fbd..5fa33b6b302 100644
--- a/mozilla/security/nss/tests/header
+++ b/mozilla/security/nss/tests/header
@@ -208,7 +208,7 @@ export BC_RELEASE
 EARLY_EXIT=TRUE     #before the report file has been created, causes Exit to 
                     #create it
 
-UX_D0=/share/builds/mccrel/nss
+UX_D0=/share/builds/mccrel3/nss
 
 ################################### glob_init ##########################
 # global shell function, main initialisation function
@@ -568,7 +568,7 @@ init_dirs()
     set_daily_build_dirs
 
     if [ -z "${BCDIST}" ] ; then
-        #BCDIST=/share/builds/mccrel/nss/${BC_MASTER}/mozilla/dist
+        #BCDIST=/share/builds/mccrel3/nss/${BC_MASTER}/mozilla/dist
         BCDIST=${NSS_VER_DIR}/../${BC_MASTER}/mozilla/dist
         if [ ! -d $BCDIST ] ; then
             ask "Backward compatibility directory $BCDIST does not exist, continue" "y" "n" || Exit
diff --git a/mozilla/security/nss/tests/jssdir b/mozilla/security/nss/tests/jssdir
index 6c9fd355e43..1609fbfcf94 100755
--- a/mozilla/security/nss/tests/jssdir
+++ b/mozilla/security/nss/tests/jssdir
@@ -17,7 +17,7 @@ else if ( "$QAYEAR" == ""  ) then
 	
 endif
 
-setenv JSS_VER_DIR /share/builds/mccrel/jss/jss$JSSVER
+setenv JSS_VER_DIR /share/builds/mccrel3/jss/jss$JSSVER
 setenv NTDIST ${JSS_VER_DIR}/builds/${QAYEAR}${BUILDDATE}.1/blowfish_NT4.0_Win95/mozilla/dist
 setenv UXDIST ${JSS_VER_DIR}/builds/${QAYEAR}${BUILDDATE}.1/booboo_Solaris8/mozilla/dist
 setenv TESTSCRIPTDIR ${JSS_VER_DIR}/builds/${QAYEAR}${BUILDDATE}.1/booboo_Solaris8/mozilla/security/jss/tests
diff --git a/mozilla/security/nss/tests/qa_stage b/mozilla/security/nss/tests/qa_stage
index f818c605a52..dcb02a72aa6 100755
--- a/mozilla/security/nss/tests/qa_stage
+++ b/mozilla/security/nss/tests/qa_stage
@@ -46,7 +46,7 @@ qa_stage_init()
 
     Echo "Init..."
     DAYBUILD=${QAYEAR}${BUILDDATE}.${BUILDNUMBER}
-    NSS_D0=/share/builds/mccrel/nss
+    NSS_D0=/share/builds/mccrel3/nss
     NSS_VER_DIR=${NSS_D0}/nss${NSSVER}
     NTDIST=${NSS_VER_DIR}/builds/${DAYBUILD}/blowfish_NT4.0_Win95/mozilla/dist
     UXDIST=${NSS_VER_DIR}/builds/${DAYBUILD}/booboo_Solaris8/mozilla/dist
diff --git a/mozilla/security/nss/tests/qa_stat b/mozilla/security/nss/tests/qa_stat
index 231a3b68b3a..aa3e4bb88ce 100755
--- a/mozilla/security/nss/tests/qa_stat
+++ b/mozilla/security/nss/tests/qa_stat
@@ -239,7 +239,7 @@ etscape]">
 <h2>
 <a href="http://tinderbox.mozilla.org/showbuilds.cgi?tree=NSS">Tinderbox</a
 ><br>
-<a href="http://cindercone.red.iplanet.com/share/builds/mccrel/nss/nsstip/tinderbox/tests_results/security/">Tinderbox QA&nbsp;result</a><br>
+<a href="http://cindercone.red.iplanet.com/share/builds/mccrel3/nss/nsstip/tinderbox/tests_results/security/">Tinderbox QA&nbsp;result</a><br>
 <a href="ftp://ftp.mozilla.org/pub/security/nss/daily_qa">Mozilla Daily NSS QA&nbsp;result</a></h2>
 &nbsp;