diff --git a/js/tests/Makefile b/js/tests/Makefile
index 1083b9774592..f67fb8360302 100644
--- a/js/tests/Makefile
+++ b/js/tests/Makefile
@@ -2,6 +2,8 @@
 
 TEST_HTTP ?= test.mozilla.com
 TEST_JS = $(shell find . -name '*.js' -print)
+CURRDIR=$(shell pwd)
+JSDIR=$(shell basename $(CURRDIR))
 
 all: menu.html js-list.txt e4x-list.txt lc-list.txt menu-list.txt
 
@@ -10,10 +12,10 @@ menu.html: menuhead.html menufoot.html Makefile spidermonkey-n.tests $(TEST_JS)
 	cat menuhead.html menubody.html menufoot.html > menu.html
 
 menu-list.txt:
-	echo "http://$(TEST_HTTP)/tests/mozilla.org/js/menu.html" > menu-list.txt
+	echo "http://$(TEST_HTTP)/tests/mozilla.org/$(JSDIR)/menu.html" > menu-list.txt
 
 js-list.txt: $(TEST_JS)
-	./list.sh ecma ecma_2 ecma_3 js1_1 js1_2 js1_3 js1_4 js1_5 js1_6 | sort > js-list.txt
+	./list.sh ecma ecma_2 ecma_3 js1_1 js1_2 js1_3 js1_4 js1_5 js1_6 js1_7 | sort > js-list.txt
 
 e4x-list.txt: $(TEST_JS)
 	./list.sh e4x | sort > e4x-list.txt
diff --git a/js/tests/Maketests b/js/tests/Maketests
index c105dcd15cb7..05c5161d4e89 100755
--- a/js/tests/Maketests
+++ b/js/tests/Maketests
@@ -53,9 +53,10 @@ ifndef TEST_JSSHELL_TIMEOUT
 TEST_JSSHELL_TIMEOUT=900
 endif
 
+MACHINE := $(shell uname -n)
 CURDIR := $(shell pwd)
 LOGPATH = $(subst /www/tests/,/www/results/,$(CURDIR))
-LOGFILE = $(LOGPATH)/$(TEST_DATE)-$(TEST_NAME)-$(TEST_BUILDID)-$(TEST_OPTDEBUG)
+LOGFILE = $(LOGPATH)/$(TEST_DATE)-$(TEST_NAME)-$(TEST_BUILDID)-$(TEST_OPTDEBUG)-$(MACHINE)
 
 JS_FILES=$(shell find . -mindepth 2 -name '*.js' -print | grep -v shell.js | grep -v browser.js | grep -v template.js | sort)
 
@@ -79,7 +80,7 @@ jsshell:
 		-o '-S 524288' \
 		-K \
 		-T $(TEST_JSSHELL_TIMEOUT) \
-		-f $(LOGFILE)-results-js.html 2>&1 | sed 's/^/jsshell: /'
+		-f $(LOGFILE)-js.html 2>&1 | sed 's/^/jsshell: /'
 
 e4xshell:
 	-perl jsDriver.pl \
@@ -89,7 +90,7 @@ e4xshell:
 		-e sm$(TEST_OPTDEBUG) \
 		-K \
 		-T $(TEST_JSSHELL_TIMEOUT) \
-		-f $(LOGFILE)-results-e4x.html 2>&1 | sed 's/^/e4xshell: /'
+		-f $(LOGFILE)-e4x.html 2>&1 | sed 's/^/e4xshell: /'
 
 #
 # browser based tests
@@ -97,22 +98,22 @@ e4xshell:
 
 jsbrowser: menu.html
 	$(TEST_BIN)/pipeline.sh \
-		"$(TEST_BIN)/spider.pl $(TEST_PRODUCT) $(TEST_BIN) $(TEST_JSBROWSER_TIMEOUT) $(TEST_EXE) $(TEST_PROFILE) /tests/mozilla.org/js/userhook-js.js menu-list.txt 0 js 2>&1" | \
+		"$(TEST_BIN)/spider.pl --product=$(TEST_PRODUCT) --bin=$(TEST_BIN) --timeout=$(TEST_JSBROWSER_TIMEOUT) --exe=$(TEST_EXE) --profile=$(TEST_PROFILE) --hook=/tests/mozilla.org/js/userhook-js.js --urls=menu-list.txt --depth=0 --id=js 2>&1" | \
 	sed 's/^/jsbrowser: /' 
 
 e4xbrowser: menu.html
 	$(TEST_BIN)/pipeline.sh \
-		"$(TEST_BIN)/spider.pl $(TEST_PRODUCT) $(TEST_BIN) $(TEST_JSBROWSER_TIMEOUT) $(TEST_EXE) $(TEST_PROFILE) /tests/mozilla.org/js/userhook-e4x.js menu-list.txt 0 e4x 2>&1" | \
+		"$(TEST_BIN)/spider.pl --product=$(TEST_PRODUCT) --bin=$(TEST_BIN) --timeout=$(TEST_JSBROWSER_TIMEOUT) --exe=$(TEST_EXE) --profile=$(TEST_PROFILE) --hook=/tests/mozilla.org/js/userhook-e4x.js --urls=menu-list.txt --depth=0 --id=e4x 2>&1" | \
 	sed 's/^/e4xbrowser: /' 
 
 jsbrowsereach: menu.html
 	$(TEST_BIN)/pipeline.sh \
-		"$(TEST_BIN)/spider.pl $(TEST_PRODUCT) $(TEST_BIN) $(TEST_JSEACH_TIMEOUT) $(TEST_EXE) $(TEST_PROFILE) /tests/mozilla.org/js/userhookeach-js.js js-list.txt 0 js 2>&1" | \
+		"$(TEST_BIN)/spider.pl --product=$(TEST_PRODUCT) --bin=$(TEST_BIN) --timeout=$(TEST_JSEACH_TIMEOUT) --exe=$(TEST_EXE) --profile=$(TEST_PROFILE) --hook=/tests/mozilla.org/js/userhookeach-js.js --urls=js-list.txt --depth=0 --id=js 2>&1" | \
 	sed 's/^/jsbrowsereach: /' 
 
 e4xbrowsereach: menu.html
 	$(TEST_BIN)/pipeline.sh \
-		"$(TEST_BIN)/spider.pl $(TEST_PRODUCT) $(TEST_BIN) $(TEST_JSEACH_TIMEOUT) $(TEST_EXE) $(TEST_PROFILE) /tests/mozilla.org/js/userhookeach-e4x.js e4x-list.txt 0 e4x 2>&1" | \
+		"$(TEST_BIN)/spider.pl --product=$(TEST_PRODUCT) --bin=$(TEST_BIN) --timeout=$(TEST_JSEACH_TIMEOUT) --exe=$(TEST_EXE) --profile=$(TEST_PROFILE) --hook=/tests/mozilla.org/js/userhookeach-e4x.js --urls=e4x-list.txt --depth=0 --id=e4x 2>&1" | \
 	sed 's/^/e4xbrowsereach: /' 
 
 menu.html: menuhead.html menufoot.html $(JS_FILES) Makefile
diff --git a/js/tests/list.sh b/js/tests/list.sh
index a3b0d4ac8990..8c528fbfaec4 100755
--- a/js/tests/list.sh
+++ b/js/tests/list.sh
@@ -1,3 +1,5 @@
+trap 'echo Unexpected error: $?; exit 2' ERR
+
 if [[ -z $TEST_HTTP ]]; then
     export TEST_HTTP=test.mozilla.com
 fi
@@ -8,6 +10,9 @@ else
     dirs=$@
 fi
 
+currdir=`pwd`
+jsdir=`basename $currdir`
+
 find $dirs \
     -mindepth 2 -name '*.js' -print | \
     grep -v shell.js | \
@@ -20,15 +25,16 @@ find $dirs \
   if [[ -z $result ]]; then
       result=`echo $jsfile | sed 's/.*js\([0-9]\)_\([0-9]\).*/\1.\2/'`
       case $result in
-	  1.1) version=";version=1.1";;
-	  1.2) version=";version=1.2";;
-	  1.3) version=";version=1.3";;
-	  1.4) version=";version=1.4";;
+#	  1.1) version=";version=1.1";;
+#	  1.2) version=";version=1.2";;
+#	  1.3) version=";version=1.3";;
+#	  1.4) version=";version=1.4";;
 	  1.5) version=";version=1.5";;
 	  1.6) version=";version=1.6";;
+	  1.7) version=";version=1.7";;
 	  *) version="";;
       esac
       
-      echo "http://${TEST_HTTP}/tests/mozilla.org/js/js-test-driver-standards.html?test=$jsfile;language=type;text/javascript$version"
+      echo "http://${TEST_HTTP}/tests/mozilla.org/$jsdir/js-test-driver-standards.html?test=$jsfile;language=type;text/javascript$version"
   fi
 done