Bug 1195288 - consider using python webserver for production talos - s/page_load_test/tests/. r=parkouss
authorJoel Maher <jmaher@mozilla.com>
Tue, 25 Aug 2015 17:07:12 -0400
changeset 1002 57baf0c8ef5d
parent 1001 762f27d9a07b
child 1003 548fa1f4ba2e
push id691
push userjmaher@mozilla.com
push dateTue, 25 Aug 2015 21:15:30 +0000
reviewersparkouss
bugs1195288
Bug 1195288 - consider using python webserver for production talos - s/page_load_test/tests/. r=parkouss
talos/config.py
talos/filter.py
talos/generate-tart-xpi.html
talos/getInfo.html
talos/page_load_test/a11y/a11y.js
talos/page_load_test/a11y/a11y.manifest
talos/page_load_test/a11y/dhtml.html
talos/page_load_test/a11y/tablemutation.html
talos/page_load_test/canvasmark/HelveticaNeueLTStd-Lt.otf
talos/page_load_test/canvasmark/HelveticaNeueLTStd-Md.otf
talos/page_load_test/canvasmark/canvasmark.manifest
talos/page_load_test/canvasmark/images/asteroid1.png
talos/page_load_test/canvasmark/images/asteroid2.png
talos/page_load_test/canvasmark/images/asteroid3.png
talos/page_load_test/canvasmark/images/asteroid4.png
talos/page_load_test/canvasmark/images/bg3_1.jpg
talos/page_load_test/canvasmark/images/canvasmark2013.jpg
talos/page_load_test/canvasmark/images/enemyship1.png
talos/page_load_test/canvasmark/images/fruit.jpg
talos/page_load_test/canvasmark/images/player.png
talos/page_load_test/canvasmark/images/texture5.png
talos/page_load_test/canvasmark/index.html
talos/page_load_test/canvasmark/license.txt
talos/page_load_test/canvasmark/ostrich-black-webfont.woff
talos/page_load_test/canvasmark/scripts/canvasmark_v6.js
talos/page_load_test/canvasmark/scripts/jquery-1.4.2.min.js
talos/page_load_test/canvasmark/scripts/k3d-min.js
talos/page_load_test/canvasmark/scripts/mathlib-min.js
talos/page_load_test/devtools/addon/chrome.manifest
talos/page_load_test/devtools/addon/content/Profiler.js
talos/page_load_test/devtools/addon/content/addon-test-frontend.js
talos/page_load_test/devtools/addon/content/damp.html
talos/page_load_test/devtools/addon/content/damp.js
talos/page_load_test/devtools/addon/content/damp.overlay.xul
talos/page_load_test/devtools/addon/content/framescript.js
talos/page_load_test/devtools/addon/content/pages/simple.html
talos/page_load_test/devtools/addon/install.rdf
talos/page_load_test/devtools/damp.manifest
talos/page_load_test/dromaeo/JSON.php
talos/page_load_test/dromaeo/LICENSE
talos/page_load_test/dromaeo/application.css
talos/page_load_test/dromaeo/css.manifest
talos/page_load_test/dromaeo/cssquery-dojo.html
talos/page_load_test/dromaeo/cssquery-ext.html
talos/page_load_test/dromaeo/cssquery-jquery.html
talos/page_load_test/dromaeo/cssquery-mootools.html
talos/page_load_test/dromaeo/cssquery-prototype.html
talos/page_load_test/dromaeo/cssquery-yui.html
talos/page_load_test/dromaeo/dom-attr.html
talos/page_load_test/dromaeo/dom-modify.html
talos/page_load_test/dromaeo/dom-query.html
talos/page_load_test/dromaeo/dom-traverse.html
talos/page_load_test/dromaeo/dom.manifest
talos/page_load_test/dromaeo/favicon.ico
talos/page_load_test/dromaeo/favicon.png
talos/page_load_test/dromaeo/htmlrunner.js
talos/page_load_test/dromaeo/ie.css
talos/page_load_test/dromaeo/images/bg.png
talos/page_load_test/dromaeo/images/clouds.png
talos/page_load_test/dromaeo/images/clouds2.png
talos/page_load_test/dromaeo/images/comets.png
talos/page_load_test/dromaeo/images/dino1.png
talos/page_load_test/dromaeo/images/dino2.png
talos/page_load_test/dromaeo/images/dino3.png
talos/page_load_test/dromaeo/images/dino4.png
talos/page_load_test/dromaeo/images/dino5.png
talos/page_load_test/dromaeo/images/dino6.png
talos/page_load_test/dromaeo/images/dino7.png
talos/page_load_test/dromaeo/images/dino8.png
talos/page_load_test/dromaeo/images/left.png
talos/page_load_test/dromaeo/images/logo.png
talos/page_load_test/dromaeo/images/logo2.png
talos/page_load_test/dromaeo/images/logo3.png
talos/page_load_test/dromaeo/images/right.png
talos/page_load_test/dromaeo/images/top.png
talos/page_load_test/dromaeo/images/water.png
talos/page_load_test/dromaeo/index.html
talos/page_load_test/dromaeo/jquery.js
talos/page_load_test/dromaeo/json.js
talos/page_load_test/dromaeo/lib/dojo.js
talos/page_load_test/dromaeo/lib/ext-base.js
talos/page_load_test/dromaeo/lib/ext-core.js
talos/page_load_test/dromaeo/lib/jquery.js
talos/page_load_test/dromaeo/lib/mootools.js
talos/page_load_test/dromaeo/lib/prototype.js
talos/page_load_test/dromaeo/lib/yahoo.js
talos/page_load_test/dromaeo/lib/yui-dom.js
talos/page_load_test/dromaeo/lib/yui-event.js
talos/page_load_test/dromaeo/lib/yui-selector.js
talos/page_load_test/dromaeo/pngfix.js
talos/page_load_test/dromaeo/reset.css
talos/page_load_test/dromaeo/store.php
talos/page_load_test/dromaeo/test-head.html
talos/page_load_test/dromaeo/test-head.js
talos/page_load_test/dromaeo/test-tail.html
talos/page_load_test/dromaeo/test-tail.js
talos/page_load_test/dromaeo/tests/MANIFEST.json
talos/page_load_test/dromaeo/tests/cssquery-dojo.html
talos/page_load_test/dromaeo/tests/cssquery-ext.html
talos/page_load_test/dromaeo/tests/cssquery-jquery.html
talos/page_load_test/dromaeo/tests/cssquery-mootools.html
talos/page_load_test/dromaeo/tests/cssquery-prototype.html
talos/page_load_test/dromaeo/tests/cssquery-yui.html
talos/page_load_test/dromaeo/tests/dom-attr.html
talos/page_load_test/dromaeo/tests/dom-modify.html
talos/page_load_test/dromaeo/tests/dom-query.html
talos/page_load_test/dromaeo/tests/dom-traverse.html
talos/page_load_test/dromaeo/tests/dromaeo-3d-cube.html
talos/page_load_test/dromaeo/tests/dromaeo-core-eval.html
talos/page_load_test/dromaeo/tests/dromaeo-object-array.html
talos/page_load_test/dromaeo/tests/dromaeo-object-regexp.html
talos/page_load_test/dromaeo/tests/dromaeo-object-string.html
talos/page_load_test/dromaeo/tests/dromaeo-string-base64.html
talos/page_load_test/dromaeo/tests/jslib-attr-jquery.html
talos/page_load_test/dromaeo/tests/jslib-attr-prototype.html
talos/page_load_test/dromaeo/tests/jslib-event-jquery.html
talos/page_load_test/dromaeo/tests/jslib-event-prototype.html
talos/page_load_test/dromaeo/tests/jslib-modify-jquery.html
talos/page_load_test/dromaeo/tests/jslib-modify-prototype.html
talos/page_load_test/dromaeo/tests/jslib-style-jquery.html
talos/page_load_test/dromaeo/tests/jslib-style-prototype.html
talos/page_load_test/dromaeo/tests/jslib-traverse-jquery.html
talos/page_load_test/dromaeo/tests/jslib-traverse-prototype.html
talos/page_load_test/dromaeo/tests/sunspider-3d-morph.html
talos/page_load_test/dromaeo/tests/sunspider-3d-raytrace.html
talos/page_load_test/dromaeo/tests/sunspider-access-binary-trees.html
talos/page_load_test/dromaeo/tests/sunspider-access-fannkuch.html
talos/page_load_test/dromaeo/tests/sunspider-access-nbody.html
talos/page_load_test/dromaeo/tests/sunspider-access-nsieve.html
talos/page_load_test/dromaeo/tests/sunspider-bitops-3bit-bits-in-byte.html
talos/page_load_test/dromaeo/tests/sunspider-bitops-bits-in-byte.html
talos/page_load_test/dromaeo/tests/sunspider-bitops-bitwise-and.html
talos/page_load_test/dromaeo/tests/sunspider-bitops-nsieve-bits.html
talos/page_load_test/dromaeo/tests/sunspider-controlflow-recursive.html
talos/page_load_test/dromaeo/tests/sunspider-crypto-aes.html
talos/page_load_test/dromaeo/tests/sunspider-crypto-md5.html
talos/page_load_test/dromaeo/tests/sunspider-crypto-sha1.html
talos/page_load_test/dromaeo/tests/sunspider-date-format-tofte.html
talos/page_load_test/dromaeo/tests/sunspider-date-format-xparb.html
talos/page_load_test/dromaeo/tests/sunspider-math-cordic.html
talos/page_load_test/dromaeo/tests/sunspider-math-partial-sums.html
talos/page_load_test/dromaeo/tests/sunspider-math-spectral-norm.html
talos/page_load_test/dromaeo/tests/sunspider-regexp-dna.html
talos/page_load_test/dromaeo/tests/sunspider-string-fasta.html
talos/page_load_test/dromaeo/tests/sunspider-string-tagcloud.html
talos/page_load_test/dromaeo/tests/sunspider-string-unpack-code.html
talos/page_load_test/dromaeo/tests/sunspider-string-validate-input.html
talos/page_load_test/dromaeo/tests/v8-crypto.html
talos/page_load_test/dromaeo/tests/v8-deltablue.html
talos/page_load_test/dromaeo/tests/v8-earley-boyer.html
talos/page_load_test/dromaeo/tests/v8-raytrace.html
talos/page_load_test/dromaeo/tests/v8-richards.html
talos/page_load_test/dromaeo/web-style.css
talos/page_load_test/dromaeo/webrunner.js
talos/page_load_test/kraken/driver.html
talos/page_load_test/kraken/kraken.css
talos/page_load_test/kraken/kraken.manifest
talos/page_load_test/kraken/test-contents.js
talos/page_load_test/kraken/test-prefix.js
talos/page_load_test/quit.js
talos/page_load_test/scroll/drac.htm
talos/page_load_test/scroll/iframe.svg
talos/page_load_test/scroll/reader.css
talos/page_load_test/scroll/reader.htm
talos/page_load_test/scroll/scroll-test.js
talos/page_load_test/scroll/scroll.js
talos/page_load_test/scroll/scroll.manifest
talos/page_load_test/scroll/strips-single.png
talos/page_load_test/scroll/strips.png
talos/page_load_test/scroll/tiled-downscale.html
talos/page_load_test/scroll/tiled-fixed-downscale.html
talos/page_load_test/scroll/tiled-fixed.html
talos/page_load_test/scroll/tiled.html
talos/page_load_test/svg_opacity/big-optimizable-group-opacity-2500.svg
talos/page_load_test/svg_opacity/small-group-opacity-2500.svg
talos/page_load_test/svg_opacity/svg_opacity.manifest
talos/page_load_test/svgx/composite-scale-opacity.svg
talos/page_load_test/svgx/composite-scale-rotate-opacity.svg
talos/page_load_test/svgx/composite-scale-rotate.svg
talos/page_load_test/svgx/composite-scale.svg
talos/page_load_test/svgx/gearflowers.svg
talos/page_load_test/svgx/hixie-001.xml
talos/page_load_test/svgx/hixie-002.xml
talos/page_load_test/svgx/hixie-003.xml
talos/page_load_test/svgx/hixie-004.xml
talos/page_load_test/svgx/hixie-005.xml
talos/page_load_test/svgx/hixie-006.xml
talos/page_load_test/svgx/hixie-007.xml
talos/page_load_test/svgx/images/kyoto_1.jpg
talos/page_load_test/svgx/images/kyoto_2.jpg
talos/page_load_test/svgx/images/smallcats.gif
talos/page_load_test/svgx/svgm.manifest
talos/page_load_test/svgx/svgx.manifest
talos/page_load_test/tabswitch/bootstrap.js
talos/page_load_test/tabswitch/chrome.manifest
talos/page_load_test/tabswitch/content/options.xul
talos/page_load_test/tabswitch/content/test.html
talos/page_load_test/tabswitch/install.rdf
talos/page_load_test/tabswitch/tps.manifest
talos/page_load_test/tart/addon/chrome.manifest
talos/page_load_test/tart/addon/content/Profiler.js
talos/page_load_test/tart/addon/content/blank.icon.html
talos/page_load_test/tart/addon/content/framescript.js
talos/page_load_test/tart/addon/content/tab-min-width-1px.css
talos/page_load_test/tart/addon/content/tart.html
talos/page_load_test/tart/addon/content/tart.ico
talos/page_load_test/tart/addon/content/tart.js
talos/page_load_test/tart/addon/content/tart.overlay.xul
talos/page_load_test/tart/addon/install.rdf
talos/page_load_test/tart/cart.manifest
talos/page_load_test/tart/tart.manifest
talos/page_load_test/tp5o.html
talos/page_load_test/v8_7/base.js
talos/page_load_test/v8_7/crypto.js
talos/page_load_test/v8_7/deltablue.js
talos/page_load_test/v8_7/earley-boyer.js
talos/page_load_test/v8_7/navier-stokes.js
talos/page_load_test/v8_7/raytrace.js
talos/page_load_test/v8_7/regexp.js
talos/page_load_test/v8_7/revisions.html
talos/page_load_test/v8_7/richards.js
talos/page_load_test/v8_7/run.html
talos/page_load_test/v8_7/splay.js
talos/page_load_test/v8_7/style.css
talos/page_load_test/v8_7/v8-logo.png
talos/page_load_test/v8_7/v8.manifest
talos/page_load_test/webgl/benchmarks/terrain/grass.jpeg
talos/page_load_test/webgl/benchmarks/terrain/perftest.html
talos/page_load_test/webgl/glterrain.manifest
talos/pageloader/chrome/Profiler.js
talos/pageloader/chrome/tscroll.js
talos/scripts/Profiler.js
talos/startup_test/media/html/media_tests.html
talos/startup_test/sessionrestore/index.html
talos/startup_test/tpaint.html
talos/startup_test/tresize/addon/content/Profiler.js
talos/startup_test/tresize/addon/content/tresize-test.html
talos/startup_test/tspaint_test.html
talos/test.py
talos/tests/a11y/a11y.js
talos/tests/a11y/a11y.manifest
talos/tests/a11y/dhtml.html
talos/tests/a11y/tablemutation.html
talos/tests/canvasmark/HelveticaNeueLTStd-Lt.otf
talos/tests/canvasmark/HelveticaNeueLTStd-Md.otf
talos/tests/canvasmark/canvasmark.manifest
talos/tests/canvasmark/images/asteroid1.png
talos/tests/canvasmark/images/asteroid2.png
talos/tests/canvasmark/images/asteroid3.png
talos/tests/canvasmark/images/asteroid4.png
talos/tests/canvasmark/images/bg3_1.jpg
talos/tests/canvasmark/images/canvasmark2013.jpg
talos/tests/canvasmark/images/enemyship1.png
talos/tests/canvasmark/images/fruit.jpg
talos/tests/canvasmark/images/player.png
talos/tests/canvasmark/images/texture5.png
talos/tests/canvasmark/index.html
talos/tests/canvasmark/license.txt
talos/tests/canvasmark/ostrich-black-webfont.woff
talos/tests/canvasmark/scripts/canvasmark_v6.js
talos/tests/canvasmark/scripts/jquery-1.4.2.min.js
talos/tests/canvasmark/scripts/k3d-min.js
talos/tests/canvasmark/scripts/mathlib-min.js
talos/tests/devtools/addon/chrome.manifest
talos/tests/devtools/addon/content/Profiler.js
talos/tests/devtools/addon/content/addon-test-frontend.js
talos/tests/devtools/addon/content/damp.html
talos/tests/devtools/addon/content/damp.js
talos/tests/devtools/addon/content/damp.overlay.xul
talos/tests/devtools/addon/content/framescript.js
talos/tests/devtools/addon/content/pages/simple.html
talos/tests/devtools/addon/install.rdf
talos/tests/devtools/damp.manifest
talos/tests/dromaeo/JSON.php
talos/tests/dromaeo/LICENSE
talos/tests/dromaeo/application.css
talos/tests/dromaeo/css.manifest
talos/tests/dromaeo/cssquery-dojo.html
talos/tests/dromaeo/cssquery-ext.html
talos/tests/dromaeo/cssquery-jquery.html
talos/tests/dromaeo/cssquery-mootools.html
talos/tests/dromaeo/cssquery-prototype.html
talos/tests/dromaeo/cssquery-yui.html
talos/tests/dromaeo/dom-attr.html
talos/tests/dromaeo/dom-modify.html
talos/tests/dromaeo/dom-query.html
talos/tests/dromaeo/dom-traverse.html
talos/tests/dromaeo/dom.manifest
talos/tests/dromaeo/favicon.ico
talos/tests/dromaeo/favicon.png
talos/tests/dromaeo/htmlrunner.js
talos/tests/dromaeo/ie.css
talos/tests/dromaeo/images/bg.png
talos/tests/dromaeo/images/clouds.png
talos/tests/dromaeo/images/clouds2.png
talos/tests/dromaeo/images/comets.png
talos/tests/dromaeo/images/dino1.png
talos/tests/dromaeo/images/dino2.png
talos/tests/dromaeo/images/dino3.png
talos/tests/dromaeo/images/dino4.png
talos/tests/dromaeo/images/dino5.png
talos/tests/dromaeo/images/dino6.png
talos/tests/dromaeo/images/dino7.png
talos/tests/dromaeo/images/dino8.png
talos/tests/dromaeo/images/left.png
talos/tests/dromaeo/images/logo.png
talos/tests/dromaeo/images/logo2.png
talos/tests/dromaeo/images/logo3.png
talos/tests/dromaeo/images/right.png
talos/tests/dromaeo/images/top.png
talos/tests/dromaeo/images/water.png
talos/tests/dromaeo/index.html
talos/tests/dromaeo/jquery.js
talos/tests/dromaeo/json.js
talos/tests/dromaeo/lib/dojo.js
talos/tests/dromaeo/lib/ext-base.js
talos/tests/dromaeo/lib/ext-core.js
talos/tests/dromaeo/lib/jquery.js
talos/tests/dromaeo/lib/mootools.js
talos/tests/dromaeo/lib/prototype.js
talos/tests/dromaeo/lib/yahoo.js
talos/tests/dromaeo/lib/yui-dom.js
talos/tests/dromaeo/lib/yui-event.js
talos/tests/dromaeo/lib/yui-selector.js
talos/tests/dromaeo/pngfix.js
talos/tests/dromaeo/reset.css
talos/tests/dromaeo/store.php
talos/tests/dromaeo/test-head.html
talos/tests/dromaeo/test-head.js
talos/tests/dromaeo/test-tail.html
talos/tests/dromaeo/test-tail.js
talos/tests/dromaeo/tests/MANIFEST.json
talos/tests/dromaeo/tests/cssquery-dojo.html
talos/tests/dromaeo/tests/cssquery-ext.html
talos/tests/dromaeo/tests/cssquery-jquery.html
talos/tests/dromaeo/tests/cssquery-mootools.html
talos/tests/dromaeo/tests/cssquery-prototype.html
talos/tests/dromaeo/tests/cssquery-yui.html
talos/tests/dromaeo/tests/dom-attr.html
talos/tests/dromaeo/tests/dom-modify.html
talos/tests/dromaeo/tests/dom-query.html
talos/tests/dromaeo/tests/dom-traverse.html
talos/tests/dromaeo/tests/dromaeo-3d-cube.html
talos/tests/dromaeo/tests/dromaeo-core-eval.html
talos/tests/dromaeo/tests/dromaeo-object-array.html
talos/tests/dromaeo/tests/dromaeo-object-regexp.html
talos/tests/dromaeo/tests/dromaeo-object-string.html
talos/tests/dromaeo/tests/dromaeo-string-base64.html
talos/tests/dromaeo/tests/jslib-attr-jquery.html
talos/tests/dromaeo/tests/jslib-attr-prototype.html
talos/tests/dromaeo/tests/jslib-event-jquery.html
talos/tests/dromaeo/tests/jslib-event-prototype.html
talos/tests/dromaeo/tests/jslib-modify-jquery.html
talos/tests/dromaeo/tests/jslib-modify-prototype.html
talos/tests/dromaeo/tests/jslib-style-jquery.html
talos/tests/dromaeo/tests/jslib-style-prototype.html
talos/tests/dromaeo/tests/jslib-traverse-jquery.html
talos/tests/dromaeo/tests/jslib-traverse-prototype.html
talos/tests/dromaeo/tests/sunspider-3d-morph.html
talos/tests/dromaeo/tests/sunspider-3d-raytrace.html
talos/tests/dromaeo/tests/sunspider-access-binary-trees.html
talos/tests/dromaeo/tests/sunspider-access-fannkuch.html
talos/tests/dromaeo/tests/sunspider-access-nbody.html
talos/tests/dromaeo/tests/sunspider-access-nsieve.html
talos/tests/dromaeo/tests/sunspider-bitops-3bit-bits-in-byte.html
talos/tests/dromaeo/tests/sunspider-bitops-bits-in-byte.html
talos/tests/dromaeo/tests/sunspider-bitops-bitwise-and.html
talos/tests/dromaeo/tests/sunspider-bitops-nsieve-bits.html
talos/tests/dromaeo/tests/sunspider-controlflow-recursive.html
talos/tests/dromaeo/tests/sunspider-crypto-aes.html
talos/tests/dromaeo/tests/sunspider-crypto-md5.html
talos/tests/dromaeo/tests/sunspider-crypto-sha1.html
talos/tests/dromaeo/tests/sunspider-date-format-tofte.html
talos/tests/dromaeo/tests/sunspider-date-format-xparb.html
talos/tests/dromaeo/tests/sunspider-math-cordic.html
talos/tests/dromaeo/tests/sunspider-math-partial-sums.html
talos/tests/dromaeo/tests/sunspider-math-spectral-norm.html
talos/tests/dromaeo/tests/sunspider-regexp-dna.html
talos/tests/dromaeo/tests/sunspider-string-fasta.html
talos/tests/dromaeo/tests/sunspider-string-tagcloud.html
talos/tests/dromaeo/tests/sunspider-string-unpack-code.html
talos/tests/dromaeo/tests/sunspider-string-validate-input.html
talos/tests/dromaeo/tests/v8-crypto.html
talos/tests/dromaeo/tests/v8-deltablue.html
talos/tests/dromaeo/tests/v8-earley-boyer.html
talos/tests/dromaeo/tests/v8-raytrace.html
talos/tests/dromaeo/tests/v8-richards.html
talos/tests/dromaeo/web-style.css
talos/tests/dromaeo/webrunner.js
talos/tests/kraken/driver.html
talos/tests/kraken/kraken.css
talos/tests/kraken/kraken.manifest
talos/tests/kraken/test-contents.js
talos/tests/kraken/test-prefix.js
talos/tests/quit.js
talos/tests/scroll/drac.htm
talos/tests/scroll/iframe.svg
talos/tests/scroll/reader.css
talos/tests/scroll/reader.htm
talos/tests/scroll/scroll-test.js
talos/tests/scroll/scroll.js
talos/tests/scroll/scroll.manifest
talos/tests/scroll/strips-single.png
talos/tests/scroll/strips.png
talos/tests/scroll/tiled-downscale.html
talos/tests/scroll/tiled-fixed-downscale.html
talos/tests/scroll/tiled-fixed.html
talos/tests/scroll/tiled.html
talos/tests/svg_opacity/big-optimizable-group-opacity-2500.svg
talos/tests/svg_opacity/small-group-opacity-2500.svg
talos/tests/svg_opacity/svg_opacity.manifest
talos/tests/svgx/composite-scale-opacity.svg
talos/tests/svgx/composite-scale-rotate-opacity.svg
talos/tests/svgx/composite-scale-rotate.svg
talos/tests/svgx/composite-scale.svg
talos/tests/svgx/gearflowers.svg
talos/tests/svgx/hixie-001.xml
talos/tests/svgx/hixie-002.xml
talos/tests/svgx/hixie-003.xml
talos/tests/svgx/hixie-004.xml
talos/tests/svgx/hixie-005.xml
talos/tests/svgx/hixie-006.xml
talos/tests/svgx/hixie-007.xml
talos/tests/svgx/images/kyoto_1.jpg
talos/tests/svgx/images/kyoto_2.jpg
talos/tests/svgx/images/smallcats.gif
talos/tests/svgx/svgm.manifest
talos/tests/svgx/svgx.manifest
talos/tests/tabswitch/bootstrap.js
talos/tests/tabswitch/chrome.manifest
talos/tests/tabswitch/content/options.xul
talos/tests/tabswitch/content/test.html
talos/tests/tabswitch/install.rdf
talos/tests/tabswitch/tps.manifest
talos/tests/tart/addon/chrome.manifest
talos/tests/tart/addon/content/Profiler.js
talos/tests/tart/addon/content/blank.icon.html
talos/tests/tart/addon/content/framescript.js
talos/tests/tart/addon/content/tab-min-width-1px.css
talos/tests/tart/addon/content/tart.html
talos/tests/tart/addon/content/tart.ico
talos/tests/tart/addon/content/tart.js
talos/tests/tart/addon/content/tart.overlay.xul
talos/tests/tart/addon/install.rdf
talos/tests/tart/cart.manifest
talos/tests/tart/tart.manifest
talos/tests/tp5o.html
talos/tests/v8_7/base.js
talos/tests/v8_7/crypto.js
talos/tests/v8_7/deltablue.js
talos/tests/v8_7/earley-boyer.js
talos/tests/v8_7/navier-stokes.js
talos/tests/v8_7/raytrace.js
talos/tests/v8_7/regexp.js
talos/tests/v8_7/revisions.html
talos/tests/v8_7/richards.js
talos/tests/v8_7/run.html
talos/tests/v8_7/splay.js
talos/tests/v8_7/style.css
talos/tests/v8_7/v8-logo.png
talos/tests/v8_7/v8.manifest
talos/tests/webgl/benchmarks/terrain/grass.jpeg
talos/tests/webgl/benchmarks/terrain/perftest.html
talos/tests/webgl/glterrain.manifest
talos/xtalos/xperf_whitelist.json
--- a/talos/config.py
+++ b/talos/config.py
@@ -453,18 +453,19 @@ def get_global_overrides(config):
 def build_manifest(config, manifestName):
     # read manifest lines
     with open(manifestName, 'r') as fHandle:
         manifestLines = fHandle.readlines()
 
     # write modified manifest lines
     with open(manifestName + '.develop', 'w') as newHandle:
         for line in manifestLines:
-            newHandle.write(line.replace('localhost',
-                                         config['webserver']))
+            newline = line.replace('localhost', config['webserver'])
+            newline = newline.replace('page_load_test', 'tests')
+            newHandle.write(newline)
 
     newManifestName = manifestName + '.develop'
 
     # return new manifest
     return newManifestName
 
 
 def get_test(config, global_overrides, counters, test_instance):
--- a/talos/filter.py
+++ b/talos/filter.py
@@ -89,17 +89,17 @@ def stddev(series):
 
 
 @define_filter
 def dromaeo(series):
     """
     dromaeo: https://wiki.mozilla.org/Dromaeo, pull the internal calculation
     out
       * This is for 'runs/s' based tests, not 'ms' tests.
-      * chunksize: defined in dromaeo: page_load_test/dromaeo/webrunner.js#l8
+      * chunksize: defined in dromaeo: tests/dromaeo/webrunner.js#l8
     """
     means = []
     chunksize = 5
     series = list(dromaeo_chunks(series, chunksize))
     for i in series:
         means.append(mean(i))
     return geometric_mean(means)
 
--- a/talos/generate-tart-xpi.html
+++ b/talos/generate-tart-xpi.html
@@ -6,17 +6,17 @@
  -->
 <head>
   <meta charset="UTF-8"/>
   <title>TART/CART addon xpi generator</title>
   <script src="scripts/jszip.min.js"></script>
   <script src="scripts/xpigen.js"></script>
 
   <script>
-    var base = "page_load_test/tart/addon/";
+    var base = "tests/tart/addon/";
     var files = [
       "chrome.manifest",
       "install.rdf",
       "content/framescript.js",
       "content/tart.overlay.xul",
       "content/tart.html",
       "content/tart.ico",
       "content/tart.js",
@@ -62,13 +62,13 @@
 
   <p>
     Once installed, to run TART or CART tests, visit
     <span style="color: green; font-family: monospace;">chrome://tart/content/tart.html</span>
     and follow the instructions.
   </p>
   <p>
     You can also build the addon yourself on a local talos repo: zip the content
-    of <span style="font-family: monospace;">talos/page_load_test/tart/addon/</span> and rename the zip to xpi.
+    of <span style="font-family: monospace;">talos/tests/tart/addon/</span> and rename the zip to xpi.
   </p>
 
 </body>
 </html>
--- a/talos/getInfo.html
+++ b/talos/getInfo.html
@@ -1,17 +1,17 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this file,
    - You can obtain one at http://mozilla.org/MPL/2.0/.  -->
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
   <meta charset="utf-8">
   <head>
     <script language="Javascript" type="text/javascript" src="scripts/MozillaFileLogger.js"></script>
-    <script language="Javascript" type="text/javascript" src="page_load_test/quit.js"></script>
+    <script language="Javascript" type="text/javascript" src="tests/quit.js"></script>
     <title>shutdown script</title>
   </head>
 
   <body onload="
     dumpLog('__metrics\tScreen width/height:' + screen.width + '/' + screen.height + '\n\tcolorDepth:' + screen.colorDepth + '\n');
     dumpLog('\tBrowser inner width/height: ' + window.innerWidth + '/' + window.innerHeight + '\n');
 //JMAHER: this is temporarily commented out because this hangs the fennec browser
 //  dumpLog('\tBrowser outer width/height: ' + window.outerWidth + '/' + window.outerHeight);
--- a/talos/pageloader/chrome/Profiler.js
+++ b/talos/pageloader/chrome/Profiler.js
@@ -1,17 +1,17 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 // - NOTE: This file is duplicated verbatim at:
 //         - talos/scripts/Profiler.js
 //         - talos/pageloader/chrome/Profiler.js
-//         - talos/page_load_test/devtools/addon/content/Profiler.js
-//         - talos/page_load_test/tart/addon/content/Profiler.js
+//         - talos/tests/devtools/addon/content/Profiler.js
+//         - talos/tests/tart/addon/content/Profiler.js
 //         - talos/startup_test/tresize/addon/content/Profiler.js
 //
 //  - Please keep these copies in sync.
 //  - Please make sure your changes apply cleanly to all use cases.
 
 // Finer grained profiler control
 //
 // Use this object to pause and resume the profiler so that it only profiles the
--- a/talos/pageloader/chrome/tscroll.js
+++ b/talos/pageloader/chrome/tscroll.js
@@ -1,10 +1,10 @@
 // Note: The content from here upto '// End scroll test' is duplicated at:
-//       - talos/page_load_test/scroll/scroll-test.js
+//       - talos/tests/scroll/scroll-test.js
 //       - inside talos/pageloader/chrome/tscroll.js
 //
 // - Please keep these copies in sync.
 // - Pleace make sure that any changes apply cleanly to all use cases.
 
 function testScroll(target, stepSize, opt_reportFunc, opt_numSteps)
 {
   var win;
--- a/talos/scripts/Profiler.js
+++ b/talos/scripts/Profiler.js
@@ -1,17 +1,17 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 // - NOTE: This file is duplicated verbatim at:
 //         - talos/scripts/Profiler.js
 //         - talos/pageloader/chrome/Profiler.js
-//         - talos/page_load_test/devtools/addon/content/Profiler.js
-//         - talos/page_load_test/tart/addon/content/Profiler.js
+//         - talos/tests/devtools/addon/content/Profiler.js
+//         - talos/tests/tart/addon/content/Profiler.js
 //         - talos/startup_test/tresize/addon/content/Profiler.js
 //
 //  - Please keep these copies in sync.
 //  - Please make sure your changes apply cleanly to all use cases.
 
 // Finer grained profiler control
 //
 // Use this object to pause and resume the profiler so that it only profiles the
--- a/talos/startup_test/media/html/media_tests.html
+++ b/talos/startup_test/media/html/media_tests.html
@@ -12,15 +12,15 @@
   <body>
     <h1> Media End to End Peformance Tests </h1>
     <br/>
     <h2> Test Progress: </h2>
     <table id="tests"></div>
     <div id="log"></div>
     <script language="Javascript" src="/scripts/MozillaFileLogger.js"></script>
     <script language="Javascript" src="/scripts/Profiler.js"></script>
-    <script language="Javascript" src="/page_load_test/quit.js"></script>
+    <script language="Javascript" src="/tests/quit.js"></script>
     <script language="Javascript" src="/startup_test/media/html/media_api.js"></script>
     <script language="Javascript" src="/startup_test/media/html/audio_playback.js"></script>
     <script language="Javascript" src="/startup_test/media/html/pc_audio_quality.js"></script>
     <script language="Javascript" src="/startup_test/media/html/media_tests.js"></script>
   </body>
 </html>
--- a/talos/startup_test/sessionrestore/index.html
+++ b/talos/startup_test/sessionrestore/index.html
@@ -1,16 +1,16 @@
 <html>
 <head>
 
 <meta charset="UTF-8"/>
 <title>Session Restore Regression Test</title>
 
 <script type="text/javascript" src="../../scripts/MozillaFileLogger.js"></script>
-<script type="text/javascript" src="../../page_load_test/quit.js"></script>
+<script type="text/javascript" src="../../tests/quit.js"></script>
 <script type="text/javascript" src="../../scripts/Profiler.js"></script>
 <script type="text/javascript" src="./main.js">
 </script>
 
 <div>
   <strong>Time between sessionRestoreInit and sessionRestored</strong>
   <span id="sessionRestoreInit-to-sessionRestored">
   (in progress)
--- a/talos/startup_test/tpaint.html
+++ b/talos/startup_test/tpaint.html
@@ -1,13 +1,13 @@
 <html>
 <meta charset='utf-8'>
 <script language="JavaScript" type="text/javascript" src="../scripts/MozillaFileLogger.js"></script>
 <script language="JavaScript" type="text/javascript" src="../scripts/Profiler.js"></script>
-<script language="JavaScript" type="text/javascript" src="../page_load_test/quit.js"></script>
+<script language="JavaScript" type="text/javascript" src="../tests/quit.js"></script>
 <script>
 var OPENER_DELAY = 1000; // ms delay between tests
 var REPEAT_COUNT = 20;
 var kid, kidStartTime, kidEndTime, windowIndex, openTimes;
 var auto = document.location.search.split('=')[1]; // ?auto=1
 
 /*
  * tpaint -- measures the amount of time between opening a new window
--- a/talos/startup_test/tresize/addon/content/Profiler.js
+++ b/talos/startup_test/tresize/addon/content/Profiler.js
@@ -1,17 +1,17 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 // - NOTE: This file is duplicated verbatim at:
 //         - talos/scripts/Profiler.js
 //         - talos/pageloader/chrome/Profiler.js
-//         - talos/page_load_test/devtools/addon/content/Profiler.js
-//         - talos/page_load_test/tart/addon/content/Profiler.js
+//         - talos/tests/devtools/addon/content/Profiler.js
+//         - talos/tests/tart/addon/content/Profiler.js
 //         - talos/startup_test/tresize/addon/content/Profiler.js
 //
 //  - Please keep these copies in sync.
 //  - Please make sure your changes apply cleanly to all use cases.
 
 // Finer grained profiler control
 //
 // Use this object to pause and resume the profiler so that it only profiles the
--- a/talos/startup_test/tresize/addon/content/tresize-test.html
+++ b/talos/startup_test/tresize/addon/content/tresize-test.html
@@ -1,16 +1,16 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this file,
    - You can obtain one at http://mozilla.org/MPL/2.0/.  -->
 <html>
 <head>
 <script language="Javascript" type="text/javascript" src="../../../../scripts/Profiler.js"></script>
 <script language="Javascript" type="text/javascript" src="../../../../scripts/MozillaFileLogger.js"></script>
-<script language="JavaScript" type="text/javascript" src="../../../../page_load_test/quit.js"></script>
+<script language="JavaScript" type="text/javascript" src="../../../../tests/quit.js"></script>
 <script language="javascript" type="text/javascript">
 
 function runTest() {
   dispatchEvent(
     new CustomEvent("tresize@mozilla.org:chrome-run-event",
                     { bubbles: true,
                       detail: { locationSearch: location.search } })
   );
--- a/talos/startup_test/tspaint_test.html
+++ b/talos/startup_test/tspaint_test.html
@@ -3,17 +3,17 @@
    - You can obtain one at http://mozilla.org/MPL/2.0/.  -->
 <html>
 <meta charset="utf-8">
 <!-- Pick off begin time as a cgi argument and print it out -->
 <!-- call this with an arg, e.g. file://foo/startup-test.html?begin=12345678 -->
 <!-- In-line this to avoid compilation. -->
 <script language="Javascript" type="text/javascript" src="../scripts/MozillaFileLogger.js"></script>
 <script language="Javascript" type="text/javascript" src="../scripts/Profiler.js"></script>
-<script language="JavaScript" type="text/javascript" src="../page_load_test/quit.js"></script>
+<script language="JavaScript" type="text/javascript" src="../tests/quit.js"></script>
 <script language="javascript" type="text/javascript">
 
 function painted() {
   var now = Date.now();
   Profiler.pause();
   Profiler.initFromURLQueryParams(location.search);
   Profiler.finishStartupProfiling();
 
--- a/talos/test.py
+++ b/talos/test.py
@@ -245,24 +245,24 @@ class PageloaderTest(Test):
             'test_name_extension']
 
 
 @register_test()
 class tps(PageloaderTest):
     """
     Tests the amount of time it takes to switch between tabs
     """
-    extensions = '${talos}/page_load_test/tabswitch'
-    tpmanifest = '${talos}/page_load_test/tabswitch/tps.manifest'
+    extensions = '${talos}/tests/tabswitch'
+    tpmanifest = '${talos}/tests/tabswitch/tps.manifest'
     tppagecycles = 5
     sps_profile_entries = 1000000
     tploadnocache = True
     preferences = {
         'addon.test.tabswitch.urlfile': os.path.join('${talos}',
-                                                     'page_load_test',
+                                                     'tests',
                                                      'tp5o.html'),
         'addon.test.tabswitch.webserver': '${webserver}',
     }
 
 
 @register_test()
 class tart(PageloaderTest):
     """
@@ -281,18 +281,18 @@ class tart(PageloaderTest):
     - Case 4 is tested with DPI scaling of 2.0 with the "icon" tab
       (favicon and long title).
     - Each animation produces 3 test results:
       - error: difference between the designated duration and the actual
         completion duration from the trigger.
       - half: average interval over the 2nd half of the animation.
       - all: average interval over all recorded intervals.
     """
-    tpmanifest = '${talos}/page_load_test/tart/tart.manifest'
-    extensions = '${talos}/page_load_test/tart/addon'
+    tpmanifest = '${talos}/tests/tart/tart.manifest'
+    extensions = '${talos}/tests/tart/addon'
     tpcycles = 1
     tppagecycles = 25
     tploadnocache = True
     tpmozafterpaint = False
     sps_profile_interval = 10
     sps_profile_entries = 1000000
     win_counters = w7_counters = linux_counters = mac_counters = None
     """
@@ -317,18 +317,18 @@ class cart(PageloaderTest):
     Reports the same animation values as TART (.half/.all/.error).
     All comments for TART also apply here (e.g. for ASAP+OMTC, etc)
     Subtests are:
     1-customize-enter - from triggering customize mode until it's ready for
     the user
     2-customize-exit  - exiting customize
     3-customize-enter-css - only the CSS animation part of entering customize
     """
-    tpmanifest = '${talos}/page_load_test/tart/cart.manifest'
-    extensions = '${talos}/page_load_test/tart/addon'
+    tpmanifest = '${talos}/tests/tart/cart.manifest'
+    extensions = '${talos}/tests/tart/addon'
     tpcycles = 1
     tppagecycles = 25
     tploadnocache = True
     tpmozafterpaint = False
     sps_profile_interval = 1
     sps_profile_entries = 10000000
     win_counters = w7_counters = linux_counters = mac_counters = None
     """
@@ -342,18 +342,18 @@ class cart(PageloaderTest):
 
 @register_test()
 class damp(PageloaderTest):
     """
     Devtools At Maximum Performance
     Tests the speed of DevTools toolbox open, close, and page reload
     for each tool, across a very simple and very complicated page.
     """
-    tpmanifest = '${talos}/page_load_test/devtools/damp.manifest'
-    extensions = '${talos}/page_load_test/devtools/addon'
+    tpmanifest = '${talos}/tests/devtools/damp.manifest'
+    extensions = '${talos}/tests/devtools/addon'
     tpcycles = 1
     tppagecycles = 25
     tploadnocache = True
     tpmozafterpaint = False
     sps_profile_interval = 10
     sps_profile_entries = 1000000
     win_counters = w7_counters = linux_counters = mac_counters = None
     filters = filter.ignore_first.prepare(1) + filter.median.prepare()
@@ -364,17 +364,17 @@ class glterrain(PageloaderTest):
     """
     Simple rotating WebGL scene with moving light source over a
     textured terrain.
     Measures average frame intervals.
     The same sequence is measured 4 times for combinations of alpha and
     antialias as canvas properties.
     Each of these 4 runs is reported as a different test name.
     """
-    tpmanifest = '${talos}/page_load_test/webgl/glterrain.manifest'
+    tpmanifest = '${talos}/tests/webgl/glterrain.manifest'
     tpcycles = 1
     tppagecycles = 25
     tploadnocache = True
     tpmozafterpaint = False
     sps_profile_interval = 10
     sps_profile_entries = 2000000
     win_counters = w7_counters = linux_counters = mac_counters = None
     """ ASAP mode """
@@ -391,17 +391,17 @@ class tp5n(PageloaderTest):
 
     The tp5 is an updated web page test set to 100 pages from April 8th, 2011.
     Effort was made for the pages to no longer be splash screens/login
     pages/home pages but to be pages that better reflect the actual content
     of the site in question.
     """
     resolution = 20
     shutdown = True
-    tpmanifest = '${talos}/page_load_test/tp5n/tp5n.manifest'
+    tpmanifest = '${talos}/tests/tp5n/tp5n.manifest'
     tpcycles = 1
     tppagecycles = 1
     cycles = 1
     tpmozafterpaint = True
     tptimeout = 5000
     rss = True
     mainthread = True
     w7_counters = []
@@ -435,17 +435,17 @@ class tp5o(PageloaderTest):
     """
     tpcycles = 1
     tppagecycles = 25
     cycles = 1
     tpmozafterpaint = True
     tptimeout = 5000
     rss = True
     mainthread = False
-    tpmanifest = '${talos}/page_load_test/tp5n/tp5o.manifest'
+    tpmanifest = '${talos}/tests/tp5n/tp5o.manifest'
     win_counters = ['Main_RSS', 'Private Bytes', '% Processor Time']
     w7_counters = ['Main_RSS', 'Private Bytes', '% Processor Time',
                    'Modified Page List Bytes']
     linux_counters = ['Private Bytes', 'XRes', 'Main_RSS']
     mac_counters = ['Main_RSS']
     responsiveness = True
     sps_profile_interval = 2
     sps_profile_entries = 4000000
@@ -453,17 +453,17 @@ class tp5o(PageloaderTest):
     timeout = 1800
 
 
 @register_test()
 class tp5o_scroll(PageloaderTest):
     """
     Tests scroll (like tscrollx does, including ASAP) but on the tp5o pageset.
     """
-    tpmanifest = '${talos}/page_load_test/tp5n/tp5o.manifest'
+    tpmanifest = '${talos}/tests/tp5n/tp5o.manifest'
     tpcycles = 1
     tppagecycles = 12
     sps_profile_interval = 2
     sps_profile_entries = 2000000
 
     tpscrolltest = True
     """ASAP mode"""
     tpmozafterpaint = False
@@ -477,48 +477,48 @@ class tp5o_scroll(PageloaderTest):
 class v8_7(PageloaderTest):
     """
     This is the V8 (version 7) javascript benchmark taken verbatim and
     slightly modified to fit into our pageloader extension and talos harness.
 
     The previous version of this test is V8 version 5 which was run on
     selective branches and operating systems.
     """
-    tpmanifest = '${talos}/page_load_test/v8_7/v8.manifest'
+    tpmanifest = '${talos}/tests/v8_7/v8.manifest'
     sps_profile_interval = 1
     sps_profile_entries = 1000000
     tpcycles = 1
     resolution = 20
     tpmozafterpaint = False
     preferences = {'dom.send_after_paint_to_content': False}
     filters = filter.v8_subtest.prepare()
 
 
 @register_test()
 class kraken(PageloaderTest):
     """
     This is the Kraken javascript benchmark taken verbatim and slightly
     modified to fit into our pageloader extension and talos harness.
     """
-    tpmanifest = '${talos}/page_load_test/kraken/kraken.manifest'
+    tpmanifest = '${talos}/tests/kraken/kraken.manifest'
     tpcycles = 1
     tppagecycles = 1
     sps_profile_interval = 0.1
     sps_profile_entries = 1000000
     tpmozafterpaint = False
     preferences = {'dom.send_after_paint_to_content': False}
     filters = filter.mean.prepare()
 
 
 @register_test()
 class tcanvasmark(PageloaderTest):
     """
     CanvasMark benchmark v0.6
     """
-    tpmanifest = '${talos}/page_load_test/canvasmark/canvasmark.manifest'
+    tpmanifest = '${talos}/tests/canvasmark/canvasmark.manifest'
     win_counters = w7_counters = linux_counters = mac_counters = None
     tpcycles = 5
     tppagecycles = 1
     timeout = 900
     sps_profile_interval = 10
     sps_profile_entries = 2500000
     tpmozafterpaint = False
     preferences = {'dom.send_after_paint_to_content': False}
@@ -536,40 +536,40 @@ class dromaeo_css(dromaeo):
     Dromaeo suite of tests for JavaScript performance testing.
     See the Dromaeo wiki (https://wiki.mozilla.org/Dromaeo)
     for more information.
 
     Each page in the manifest is part of the dromaemo css benchmark.
     """
     sps_profile_interval = 2
     sps_profile_entries = 10000000
-    tpmanifest = '${talos}/page_load_test/dromaeo/css.manifest'
+    tpmanifest = '${talos}/tests/dromaeo/css.manifest'
 
 
 @register_test()
 class dromaeo_dom(dromaeo):
     """
     Dromaeo suite of tests for JavaScript performance testing.
     See the Dromaeo wiki (https://wiki.mozilla.org/Dromaeo)
     for more information.
 
     Each page in the manifest is part of the dromaemo dom benchmark.
     """
     sps_profile_interval = 2
     sps_profile_entries = 10000000
-    tpmanifest = '${talos}/page_load_test/dromaeo/dom.manifest'
+    tpmanifest = '${talos}/tests/dromaeo/dom.manifest'
     tpdisable_e10s = True
 
 
 @register_test()
 class tsvgm(PageloaderTest):
     """
     An svg-only number that measures SVG rendering performance.
     """
-    tpmanifest = '${talos}/page_load_test/svgx/svgm.manifest'
+    tpmanifest = '${talos}/tests/svgx/svgm.manifest'
     tpcycles = 1
     tppagecycles = 7
     tpmozafterpaint = False
     sps_profile_interval = 10
     sps_profile_entries = 1000000
     """ASAP mode"""
     preferences = {'layout.frame_rate': 0,
                    'docshell.event_starvation_delay_hint': 1,
@@ -577,17 +577,17 @@ class tsvgm(PageloaderTest):
     filters = filter.ignore_first.prepare(2) + filter.median.prepare()
 
 
 @register_test()
 class tsvgx(PageloaderTest):
     """
     An svg-only number that measures SVG rendering performance.
     """
-    tpmanifest = '${talos}/page_load_test/svgx/svgx.manifest'
+    tpmanifest = '${talos}/tests/svgx/svgx.manifest'
     tpcycles = 1
     tppagecycles = 25
     tpmozafterpaint = False
     sps_profile_interval = 10
     sps_profile_entries = 1000000
     """ASAP mode"""
     preferences = {'layout.frame_rate': 0,
                    'docshell.event_starvation_delay_hint': 1,
@@ -595,30 +595,30 @@ class tsvgx(PageloaderTest):
     filters = filter.ignore_first.prepare(5) + filter.median.prepare()
 
 
 @register_test()
 class tsvgr_opacity(PageloaderTest):
     """
     An svg-only number that measures SVG rendering performance.
     """
-    tpmanifest = '${talos}/page_load_test/svg_opacity/svg_opacity.manifest'
+    tpmanifest = '${talos}/tests/svg_opacity/svg_opacity.manifest'
     tpcycles = 1
     tppagecycles = 25
     sps_profile_interval = 1
     sps_profile_entries = 10000000
     filters = filter.ignore_first.prepare(5) + filter.median.prepare()
 
 
 @register_test()
 class tscrollx(PageloaderTest):
     """
     This test does some scrolly thing.
     """
-    tpmanifest = '${talos}/page_load_test/scroll/scroll.manifest'
+    tpmanifest = '${talos}/tests/scroll/scroll.manifest'
     tpcycles = 1
     tppagecycles = 25
     tpmozafterpaint = False
     sps_profile_interval = 1
     sps_profile_entries = 1000000
     """ ASAP mode """
     preferences = {'layout.frame_rate': 0,
                    'docshell.event_starvation_delay_hint': 1,
@@ -627,13 +627,13 @@ class tscrollx(PageloaderTest):
 
 
 @register_test()
 class a11yr(PageloaderTest):
     """
     This test ensures basic a11y tables and permutations do not cause
     performance regressions.
     """
-    tpmanifest = '${talos}/page_load_test/a11y/a11y.manifest'
+    tpmanifest = '${talos}/tests/a11y/a11y.manifest'
     tpcycles = 1
     tppagecycles = 25
     tpmozafterpaint = True
     preferences = {'dom.send_after_paint_to_content': False}
rename from talos/page_load_test/a11y/a11y.js
rename to talos/tests/a11y/a11y.js
rename from talos/page_load_test/a11y/a11y.manifest
rename to talos/tests/a11y/a11y.manifest
rename from talos/page_load_test/a11y/dhtml.html
rename to talos/tests/a11y/dhtml.html
rename from talos/page_load_test/a11y/tablemutation.html
rename to talos/tests/a11y/tablemutation.html
rename from talos/page_load_test/canvasmark/HelveticaNeueLTStd-Lt.otf
rename to talos/tests/canvasmark/HelveticaNeueLTStd-Lt.otf
rename from talos/page_load_test/canvasmark/HelveticaNeueLTStd-Md.otf
rename to talos/tests/canvasmark/HelveticaNeueLTStd-Md.otf
rename from talos/page_load_test/canvasmark/canvasmark.manifest
rename to talos/tests/canvasmark/canvasmark.manifest
--- a/talos/page_load_test/canvasmark/canvasmark.manifest
+++ b/talos/tests/canvasmark/canvasmark.manifest
@@ -1,3 +1,3 @@
-% http://localhost/page_load_test/canvasmark/index.html?auto=true
+% http://localhost/tests/canvasmark/index.html?auto=true
 
 
rename from talos/page_load_test/canvasmark/images/asteroid1.png
rename to talos/tests/canvasmark/images/asteroid1.png
rename from talos/page_load_test/canvasmark/images/asteroid2.png
rename to talos/tests/canvasmark/images/asteroid2.png
rename from talos/page_load_test/canvasmark/images/asteroid3.png
rename to talos/tests/canvasmark/images/asteroid3.png
rename from talos/page_load_test/canvasmark/images/asteroid4.png
rename to talos/tests/canvasmark/images/asteroid4.png
rename from talos/page_load_test/canvasmark/images/bg3_1.jpg
rename to talos/tests/canvasmark/images/bg3_1.jpg
rename from talos/page_load_test/canvasmark/images/canvasmark2013.jpg
rename to talos/tests/canvasmark/images/canvasmark2013.jpg
rename from talos/page_load_test/canvasmark/images/enemyship1.png
rename to talos/tests/canvasmark/images/enemyship1.png
rename from talos/page_load_test/canvasmark/images/fruit.jpg
rename to talos/tests/canvasmark/images/fruit.jpg
rename from talos/page_load_test/canvasmark/images/player.png
rename to talos/tests/canvasmark/images/player.png
rename from talos/page_load_test/canvasmark/images/texture5.png
rename to talos/tests/canvasmark/images/texture5.png
rename from talos/page_load_test/canvasmark/index.html
rename to talos/tests/canvasmark/index.html
rename from talos/page_load_test/canvasmark/license.txt
rename to talos/tests/canvasmark/license.txt
rename from talos/page_load_test/canvasmark/ostrich-black-webfont.woff
rename to talos/tests/canvasmark/ostrich-black-webfont.woff
rename from talos/page_load_test/canvasmark/scripts/canvasmark_v6.js
rename to talos/tests/canvasmark/scripts/canvasmark_v6.js
rename from talos/page_load_test/canvasmark/scripts/jquery-1.4.2.min.js
rename to talos/tests/canvasmark/scripts/jquery-1.4.2.min.js
rename from talos/page_load_test/canvasmark/scripts/k3d-min.js
rename to talos/tests/canvasmark/scripts/k3d-min.js
rename from talos/page_load_test/canvasmark/scripts/mathlib-min.js
rename to talos/tests/canvasmark/scripts/mathlib-min.js
rename from talos/page_load_test/devtools/addon/chrome.manifest
rename to talos/tests/devtools/addon/chrome.manifest
rename from talos/page_load_test/devtools/addon/content/Profiler.js
rename to talos/tests/devtools/addon/content/Profiler.js
--- a/talos/page_load_test/devtools/addon/content/Profiler.js
+++ b/talos/tests/devtools/addon/content/Profiler.js
@@ -1,17 +1,17 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 // - NOTE: This file is duplicated verbatim at:
 //         - talos/scripts/Profiler.js
 //         - talos/pageloader/chrome/Profiler.js
-//         - talos/page_load_test/devtools/addon/content/Profiler.js
-//         - talos/page_load_test/tart/addon/content/Profiler.js
+//         - talos/tests/devtools/addon/content/Profiler.js
+//         - talos/tests/tart/addon/content/Profiler.js
 //         - talos/startup_test/tresize/addon/content/Profiler.js
 //
 //  - Please keep these copies in sync.
 //  - Please make sure your changes apply cleanly to all use cases.
 
 // Finer grained profiler control
 //
 // Use this object to pause and resume the profiler so that it only profiles the
rename from talos/page_load_test/devtools/addon/content/addon-test-frontend.js
rename to talos/tests/devtools/addon/content/addon-test-frontend.js
rename from talos/page_load_test/devtools/addon/content/damp.html
rename to talos/tests/devtools/addon/content/damp.html
--- a/talos/page_load_test/devtools/addon/content/damp.html
+++ b/talos/tests/devtools/addon/content/damp.html
@@ -51,17 +51,17 @@ function updateConfig() {
 <div id="hide-during-run">
    Visit <a href="https://wiki.mozilla.org/Buildbot/Talos/Tests#DAMP">talos/TART</a> for detailed info.<br/>
   <ul>
     <li><b>If you just opened the browser</b> - give Firefox few seconds to settle down before testing.</li>
   </ul>
 
 Utilities:
   <a href="pages/simple.html">simple page</a>&nbsp;&nbsp;&nbsp;
-  <a href="http://localhost/page_load_test/tp5n/bild.de/www.bild.de/index.html">complicated page</a>&nbsp;&nbsp;&nbsp;
+  <a href="http://localhost/tests/tp5n/bild.de/www.bild.de/index.html">complicated page</a>&nbsp;&nbsp;&nbsp;
 <br/><br/>
 <b>Configure DAMP</b> (CTRL-F5 to reset to talos defaults) <button type="button" onclick="deselectAll()">Deselect all tests</button><br/>
 <script>
   for (var test in defaultConfig.subtests) {
     document.write('<input type="checkbox" id="subtest-' + test + '" ' + (defaultConfig.subtests[test] ? "" : "un") + 'checked>'
                   + test + '</input>'
                   + '<span style="color:grey">&nbsp;&nbsp;&nbsp;' + testsInfo[test] + '</span>'
                   + '<br/>');
rename from talos/page_load_test/devtools/addon/content/damp.js
rename to talos/tests/devtools/addon/content/damp.js
--- a/talos/page_load_test/devtools/addon/content/damp.js
+++ b/talos/tests/devtools/addon/content/damp.js
@@ -1,17 +1,17 @@
 
 Components.utils.import("resource:///modules/devtools/gDevTools.jsm");
 const {devtools} =
   Components.utils.import("resource://gre/modules/devtools/Loader.jsm", {});
 const { getActiveTab } = devtools.require("sdk/tabs/utils");
 const { getMostRecentBrowserWindow } = devtools.require("sdk/window/utils");
 
 const SIMPLE_URL = "chrome://damp/content/pages/simple.html";
-const COMPLICATED_URL = "http://localhost/page_load_test/tp5n/bild.de/www.bild.de/index.html";
+const COMPLICATED_URL = "http://localhost/tests/tp5n/bild.de/www.bild.de/index.html";
 
 function Damp() {
 }
 
 Damp.prototype = {
 
   addTab: function(url) {
     return new Promise((resolve, reject) => {
rename from talos/page_load_test/devtools/addon/content/damp.overlay.xul
rename to talos/tests/devtools/addon/content/damp.overlay.xul
rename from talos/page_load_test/devtools/addon/content/framescript.js
rename to talos/tests/devtools/addon/content/framescript.js
rename from talos/page_load_test/devtools/addon/content/pages/simple.html
rename to talos/tests/devtools/addon/content/pages/simple.html
rename from talos/page_load_test/devtools/addon/install.rdf
rename to talos/tests/devtools/addon/install.rdf
rename from talos/page_load_test/devtools/damp.manifest
rename to talos/tests/devtools/damp.manifest
rename from talos/page_load_test/dromaeo/JSON.php
rename to talos/tests/dromaeo/JSON.php
rename from talos/page_load_test/dromaeo/LICENSE
rename to talos/tests/dromaeo/LICENSE
rename from talos/page_load_test/dromaeo/application.css
rename to talos/tests/dromaeo/application.css
rename from talos/page_load_test/dromaeo/css.manifest
rename to talos/tests/dromaeo/css.manifest
--- a/talos/page_load_test/dromaeo/css.manifest
+++ b/talos/tests/dromaeo/css.manifest
@@ -1,6 +1,6 @@
-% http://localhost/page_load_test/dromaeo/cssquery-dojo.html
-% http://localhost/page_load_test/dromaeo/cssquery-ext.html
-% http://localhost/page_load_test/dromaeo/cssquery-jquery.html
-% http://localhost/page_load_test/dromaeo/cssquery-mootools.html
-% http://localhost/page_load_test/dromaeo/cssquery-prototype.html
-% http://localhost/page_load_test/dromaeo/cssquery-yui.html
+% http://localhost/tests/dromaeo/cssquery-dojo.html
+% http://localhost/tests/dromaeo/cssquery-ext.html
+% http://localhost/tests/dromaeo/cssquery-jquery.html
+% http://localhost/tests/dromaeo/cssquery-mootools.html
+% http://localhost/tests/dromaeo/cssquery-prototype.html
+% http://localhost/tests/dromaeo/cssquery-yui.html
rename from talos/page_load_test/dromaeo/cssquery-dojo.html
rename to talos/tests/dromaeo/cssquery-dojo.html
rename from talos/page_load_test/dromaeo/cssquery-ext.html
rename to talos/tests/dromaeo/cssquery-ext.html
rename from talos/page_load_test/dromaeo/cssquery-jquery.html
rename to talos/tests/dromaeo/cssquery-jquery.html
rename from talos/page_load_test/dromaeo/cssquery-mootools.html
rename to talos/tests/dromaeo/cssquery-mootools.html
rename from talos/page_load_test/dromaeo/cssquery-prototype.html
rename to talos/tests/dromaeo/cssquery-prototype.html
rename from talos/page_load_test/dromaeo/cssquery-yui.html
rename to talos/tests/dromaeo/cssquery-yui.html
rename from talos/page_load_test/dromaeo/dom-attr.html
rename to talos/tests/dromaeo/dom-attr.html
rename from talos/page_load_test/dromaeo/dom-modify.html
rename to talos/tests/dromaeo/dom-modify.html
rename from talos/page_load_test/dromaeo/dom-query.html
rename to talos/tests/dromaeo/dom-query.html
rename from talos/page_load_test/dromaeo/dom-traverse.html
rename to talos/tests/dromaeo/dom-traverse.html
rename from talos/page_load_test/dromaeo/dom.manifest
rename to talos/tests/dromaeo/dom.manifest
--- a/talos/page_load_test/dromaeo/dom.manifest
+++ b/talos/tests/dromaeo/dom.manifest
@@ -1,4 +1,4 @@
-% http://localhost/page_load_test/dromaeo/dom-attr.html
-% http://localhost/page_load_test/dromaeo/dom-modify.html
-% http://localhost/page_load_test/dromaeo/dom-query.html
-% http://localhost/page_load_test/dromaeo/dom-traverse.html
+% http://localhost/tests/dromaeo/dom-attr.html
+% http://localhost/tests/dromaeo/dom-modify.html
+% http://localhost/tests/dromaeo/dom-query.html
+% http://localhost/tests/dromaeo/dom-traverse.html
rename from talos/page_load_test/dromaeo/favicon.ico
rename to talos/tests/dromaeo/favicon.ico
rename from talos/page_load_test/dromaeo/favicon.png
rename to talos/tests/dromaeo/favicon.png
rename from talos/page_load_test/dromaeo/htmlrunner.js
rename to talos/tests/dromaeo/htmlrunner.js
rename from talos/page_load_test/dromaeo/ie.css
rename to talos/tests/dromaeo/ie.css
rename from talos/page_load_test/dromaeo/images/bg.png
rename to talos/tests/dromaeo/images/bg.png
rename from talos/page_load_test/dromaeo/images/clouds.png
rename to talos/tests/dromaeo/images/clouds.png
rename from talos/page_load_test/dromaeo/images/clouds2.png
rename to talos/tests/dromaeo/images/clouds2.png
rename from talos/page_load_test/dromaeo/images/comets.png
rename to talos/tests/dromaeo/images/comets.png
rename from talos/page_load_test/dromaeo/images/dino1.png
rename to talos/tests/dromaeo/images/dino1.png
rename from talos/page_load_test/dromaeo/images/dino2.png
rename to talos/tests/dromaeo/images/dino2.png
rename from talos/page_load_test/dromaeo/images/dino3.png
rename to talos/tests/dromaeo/images/dino3.png
rename from talos/page_load_test/dromaeo/images/dino4.png
rename to talos/tests/dromaeo/images/dino4.png
rename from talos/page_load_test/dromaeo/images/dino5.png
rename to talos/tests/dromaeo/images/dino5.png
rename from talos/page_load_test/dromaeo/images/dino6.png
rename to talos/tests/dromaeo/images/dino6.png
rename from talos/page_load_test/dromaeo/images/dino7.png
rename to talos/tests/dromaeo/images/dino7.png
rename from talos/page_load_test/dromaeo/images/dino8.png
rename to talos/tests/dromaeo/images/dino8.png
rename from talos/page_load_test/dromaeo/images/left.png
rename to talos/tests/dromaeo/images/left.png
rename from talos/page_load_test/dromaeo/images/logo.png
rename to talos/tests/dromaeo/images/logo.png
rename from talos/page_load_test/dromaeo/images/logo2.png
rename to talos/tests/dromaeo/images/logo2.png
rename from talos/page_load_test/dromaeo/images/logo3.png
rename to talos/tests/dromaeo/images/logo3.png
rename from talos/page_load_test/dromaeo/images/right.png
rename to talos/tests/dromaeo/images/right.png
rename from talos/page_load_test/dromaeo/images/top.png
rename to talos/tests/dromaeo/images/top.png
rename from talos/page_load_test/dromaeo/images/water.png
rename to talos/tests/dromaeo/images/water.png
rename from talos/page_load_test/dromaeo/index.html
rename to talos/tests/dromaeo/index.html
rename from talos/page_load_test/dromaeo/jquery.js
rename to talos/tests/dromaeo/jquery.js
rename from talos/page_load_test/dromaeo/json.js
rename to talos/tests/dromaeo/json.js
rename from talos/page_load_test/dromaeo/lib/dojo.js
rename to talos/tests/dromaeo/lib/dojo.js
rename from talos/page_load_test/dromaeo/lib/ext-base.js
rename to talos/tests/dromaeo/lib/ext-base.js
rename from talos/page_load_test/dromaeo/lib/ext-core.js
rename to talos/tests/dromaeo/lib/ext-core.js
rename from talos/page_load_test/dromaeo/lib/jquery.js
rename to talos/tests/dromaeo/lib/jquery.js
rename from talos/page_load_test/dromaeo/lib/mootools.js
rename to talos/tests/dromaeo/lib/mootools.js
rename from talos/page_load_test/dromaeo/lib/prototype.js
rename to talos/tests/dromaeo/lib/prototype.js
rename from talos/page_load_test/dromaeo/lib/yahoo.js
rename to talos/tests/dromaeo/lib/yahoo.js
rename from talos/page_load_test/dromaeo/lib/yui-dom.js
rename to talos/tests/dromaeo/lib/yui-dom.js
rename from talos/page_load_test/dromaeo/lib/yui-event.js
rename to talos/tests/dromaeo/lib/yui-event.js
rename from talos/page_load_test/dromaeo/lib/yui-selector.js
rename to talos/tests/dromaeo/lib/yui-selector.js
rename from talos/page_load_test/dromaeo/pngfix.js
rename to talos/tests/dromaeo/pngfix.js
rename from talos/page_load_test/dromaeo/reset.css
rename to talos/tests/dromaeo/reset.css
rename from talos/page_load_test/dromaeo/store.php
rename to talos/tests/dromaeo/store.php
rename from talos/page_load_test/dromaeo/test-head.html
rename to talos/tests/dromaeo/test-head.html
rename from talos/page_load_test/dromaeo/test-head.js
rename to talos/tests/dromaeo/test-head.js
rename from talos/page_load_test/dromaeo/test-tail.html
rename to talos/tests/dromaeo/test-tail.html
rename from talos/page_load_test/dromaeo/test-tail.js
rename to talos/tests/dromaeo/test-tail.js
rename from talos/page_load_test/dromaeo/tests/MANIFEST.json
rename to talos/tests/dromaeo/tests/MANIFEST.json
rename from talos/page_load_test/dromaeo/tests/cssquery-dojo.html
rename to talos/tests/dromaeo/tests/cssquery-dojo.html
rename from talos/page_load_test/dromaeo/tests/cssquery-ext.html
rename to talos/tests/dromaeo/tests/cssquery-ext.html
rename from talos/page_load_test/dromaeo/tests/cssquery-jquery.html
rename to talos/tests/dromaeo/tests/cssquery-jquery.html
rename from talos/page_load_test/dromaeo/tests/cssquery-mootools.html
rename to talos/tests/dromaeo/tests/cssquery-mootools.html
rename from talos/page_load_test/dromaeo/tests/cssquery-prototype.html
rename to talos/tests/dromaeo/tests/cssquery-prototype.html
rename from talos/page_load_test/dromaeo/tests/cssquery-yui.html
rename to talos/tests/dromaeo/tests/cssquery-yui.html
rename from talos/page_load_test/dromaeo/tests/dom-attr.html
rename to talos/tests/dromaeo/tests/dom-attr.html
rename from talos/page_load_test/dromaeo/tests/dom-modify.html
rename to talos/tests/dromaeo/tests/dom-modify.html
rename from talos/page_load_test/dromaeo/tests/dom-query.html
rename to talos/tests/dromaeo/tests/dom-query.html
rename from talos/page_load_test/dromaeo/tests/dom-traverse.html
rename to talos/tests/dromaeo/tests/dom-traverse.html
rename from talos/page_load_test/dromaeo/tests/dromaeo-3d-cube.html
rename to talos/tests/dromaeo/tests/dromaeo-3d-cube.html
rename from talos/page_load_test/dromaeo/tests/dromaeo-core-eval.html
rename to talos/tests/dromaeo/tests/dromaeo-core-eval.html
rename from talos/page_load_test/dromaeo/tests/dromaeo-object-array.html
rename to talos/tests/dromaeo/tests/dromaeo-object-array.html
rename from talos/page_load_test/dromaeo/tests/dromaeo-object-regexp.html
rename to talos/tests/dromaeo/tests/dromaeo-object-regexp.html
rename from talos/page_load_test/dromaeo/tests/dromaeo-object-string.html
rename to talos/tests/dromaeo/tests/dromaeo-object-string.html
rename from talos/page_load_test/dromaeo/tests/dromaeo-string-base64.html
rename to talos/tests/dromaeo/tests/dromaeo-string-base64.html
rename from talos/page_load_test/dromaeo/tests/jslib-attr-jquery.html
rename to talos/tests/dromaeo/tests/jslib-attr-jquery.html
rename from talos/page_load_test/dromaeo/tests/jslib-attr-prototype.html
rename to talos/tests/dromaeo/tests/jslib-attr-prototype.html
rename from talos/page_load_test/dromaeo/tests/jslib-event-jquery.html
rename to talos/tests/dromaeo/tests/jslib-event-jquery.html
rename from talos/page_load_test/dromaeo/tests/jslib-event-prototype.html
rename to talos/tests/dromaeo/tests/jslib-event-prototype.html
rename from talos/page_load_test/dromaeo/tests/jslib-modify-jquery.html
rename to talos/tests/dromaeo/tests/jslib-modify-jquery.html
rename from talos/page_load_test/dromaeo/tests/jslib-modify-prototype.html
rename to talos/tests/dromaeo/tests/jslib-modify-prototype.html
rename from talos/page_load_test/dromaeo/tests/jslib-style-jquery.html
rename to talos/tests/dromaeo/tests/jslib-style-jquery.html
rename from talos/page_load_test/dromaeo/tests/jslib-style-prototype.html
rename to talos/tests/dromaeo/tests/jslib-style-prototype.html
rename from talos/page_load_test/dromaeo/tests/jslib-traverse-jquery.html
rename to talos/tests/dromaeo/tests/jslib-traverse-jquery.html
rename from talos/page_load_test/dromaeo/tests/jslib-traverse-prototype.html
rename to talos/tests/dromaeo/tests/jslib-traverse-prototype.html
rename from talos/page_load_test/dromaeo/tests/sunspider-3d-morph.html
rename to talos/tests/dromaeo/tests/sunspider-3d-morph.html
rename from talos/page_load_test/dromaeo/tests/sunspider-3d-raytrace.html
rename to talos/tests/dromaeo/tests/sunspider-3d-raytrace.html
rename from talos/page_load_test/dromaeo/tests/sunspider-access-binary-trees.html
rename to talos/tests/dromaeo/tests/sunspider-access-binary-trees.html
rename from talos/page_load_test/dromaeo/tests/sunspider-access-fannkuch.html
rename to talos/tests/dromaeo/tests/sunspider-access-fannkuch.html
rename from talos/page_load_test/dromaeo/tests/sunspider-access-nbody.html
rename to talos/tests/dromaeo/tests/sunspider-access-nbody.html
rename from talos/page_load_test/dromaeo/tests/sunspider-access-nsieve.html
rename to talos/tests/dromaeo/tests/sunspider-access-nsieve.html
rename from talos/page_load_test/dromaeo/tests/sunspider-bitops-3bit-bits-in-byte.html
rename to talos/tests/dromaeo/tests/sunspider-bitops-3bit-bits-in-byte.html
rename from talos/page_load_test/dromaeo/tests/sunspider-bitops-bits-in-byte.html
rename to talos/tests/dromaeo/tests/sunspider-bitops-bits-in-byte.html
rename from talos/page_load_test/dromaeo/tests/sunspider-bitops-bitwise-and.html
rename to talos/tests/dromaeo/tests/sunspider-bitops-bitwise-and.html
rename from talos/page_load_test/dromaeo/tests/sunspider-bitops-nsieve-bits.html
rename to talos/tests/dromaeo/tests/sunspider-bitops-nsieve-bits.html
rename from talos/page_load_test/dromaeo/tests/sunspider-controlflow-recursive.html
rename to talos/tests/dromaeo/tests/sunspider-controlflow-recursive.html
rename from talos/page_load_test/dromaeo/tests/sunspider-crypto-aes.html
rename to talos/tests/dromaeo/tests/sunspider-crypto-aes.html
rename from talos/page_load_test/dromaeo/tests/sunspider-crypto-md5.html
rename to talos/tests/dromaeo/tests/sunspider-crypto-md5.html
rename from talos/page_load_test/dromaeo/tests/sunspider-crypto-sha1.html
rename to talos/tests/dromaeo/tests/sunspider-crypto-sha1.html
rename from talos/page_load_test/dromaeo/tests/sunspider-date-format-tofte.html
rename to talos/tests/dromaeo/tests/sunspider-date-format-tofte.html
rename from talos/page_load_test/dromaeo/tests/sunspider-date-format-xparb.html
rename to talos/tests/dromaeo/tests/sunspider-date-format-xparb.html
rename from talos/page_load_test/dromaeo/tests/sunspider-math-cordic.html
rename to talos/tests/dromaeo/tests/sunspider-math-cordic.html
rename from talos/page_load_test/dromaeo/tests/sunspider-math-partial-sums.html
rename to talos/tests/dromaeo/tests/sunspider-math-partial-sums.html
rename from talos/page_load_test/dromaeo/tests/sunspider-math-spectral-norm.html
rename to talos/tests/dromaeo/tests/sunspider-math-spectral-norm.html
rename from talos/page_load_test/dromaeo/tests/sunspider-regexp-dna.html
rename to talos/tests/dromaeo/tests/sunspider-regexp-dna.html
rename from talos/page_load_test/dromaeo/tests/sunspider-string-fasta.html
rename to talos/tests/dromaeo/tests/sunspider-string-fasta.html
rename from talos/page_load_test/dromaeo/tests/sunspider-string-tagcloud.html
rename to talos/tests/dromaeo/tests/sunspider-string-tagcloud.html
rename from talos/page_load_test/dromaeo/tests/sunspider-string-unpack-code.html
rename to talos/tests/dromaeo/tests/sunspider-string-unpack-code.html
rename from talos/page_load_test/dromaeo/tests/sunspider-string-validate-input.html
rename to talos/tests/dromaeo/tests/sunspider-string-validate-input.html
rename from talos/page_load_test/dromaeo/tests/v8-crypto.html
rename to talos/tests/dromaeo/tests/v8-crypto.html
rename from talos/page_load_test/dromaeo/tests/v8-deltablue.html
rename to talos/tests/dromaeo/tests/v8-deltablue.html
rename from talos/page_load_test/dromaeo/tests/v8-earley-boyer.html
rename to talos/tests/dromaeo/tests/v8-earley-boyer.html
rename from talos/page_load_test/dromaeo/tests/v8-raytrace.html
rename to talos/tests/dromaeo/tests/v8-raytrace.html
rename from talos/page_load_test/dromaeo/tests/v8-richards.html
rename to talos/tests/dromaeo/tests/v8-richards.html
rename from talos/page_load_test/dromaeo/web-style.css
rename to talos/tests/dromaeo/web-style.css
rename from talos/page_load_test/dromaeo/webrunner.js
rename to talos/tests/dromaeo/webrunner.js
rename from talos/page_load_test/kraken/driver.html
rename to talos/tests/kraken/driver.html
rename from talos/page_load_test/kraken/kraken.css
rename to talos/tests/kraken/kraken.css
rename from talos/page_load_test/kraken/kraken.manifest
rename to talos/tests/kraken/kraken.manifest
--- a/talos/page_load_test/kraken/kraken.manifest
+++ b/talos/tests/kraken/kraken.manifest
@@ -1,14 +1,14 @@
-% http://localhost/page_load_test/kraken/driver.html?testName=ai-astar
-% http://localhost/page_load_test/kraken/driver.html?testName=audio-beat-detection
-% http://localhost/page_load_test/kraken/driver.html?testName=audio-dft
-% http://localhost/page_load_test/kraken/driver.html?testName=audio-fft
-% http://localhost/page_load_test/kraken/driver.html?testName=audio-oscillator
-% http://localhost/page_load_test/kraken/driver.html?testName=imaging-gaussian-blur
-% http://localhost/page_load_test/kraken/driver.html?testName=imaging-darkroom
-% http://localhost/page_load_test/kraken/driver.html?testName=imaging-desaturate
-% http://localhost/page_load_test/kraken/driver.html?testName=json-parse-financial
-% http://localhost/page_load_test/kraken/driver.html?testName=json-stringify-tinderbox
-% http://localhost/page_load_test/kraken/driver.html?testName=stanford-crypto-aes
-% http://localhost/page_load_test/kraken/driver.html?testName=stanford-crypto-ccm
-% http://localhost/page_load_test/kraken/driver.html?testName=stanford-crypto-pbkdf2
-% http://localhost/page_load_test/kraken/driver.html?testName=stanford-crypto-sha256-iterative
+% http://localhost/tests/kraken/driver.html?testName=ai-astar
+% http://localhost/tests/kraken/driver.html?testName=audio-beat-detection
+% http://localhost/tests/kraken/driver.html?testName=audio-dft
+% http://localhost/tests/kraken/driver.html?testName=audio-fft
+% http://localhost/tests/kraken/driver.html?testName=audio-oscillator
+% http://localhost/tests/kraken/driver.html?testName=imaging-gaussian-blur
+% http://localhost/tests/kraken/driver.html?testName=imaging-darkroom
+% http://localhost/tests/kraken/driver.html?testName=imaging-desaturate
+% http://localhost/tests/kraken/driver.html?testName=json-parse-financial
+% http://localhost/tests/kraken/driver.html?testName=json-stringify-tinderbox
+% http://localhost/tests/kraken/driver.html?testName=stanford-crypto-aes
+% http://localhost/tests/kraken/driver.html?testName=stanford-crypto-ccm
+% http://localhost/tests/kraken/driver.html?testName=stanford-crypto-pbkdf2
+% http://localhost/tests/kraken/driver.html?testName=stanford-crypto-sha256-iterative
rename from talos/page_load_test/kraken/test-contents.js
rename to talos/tests/kraken/test-contents.js
rename from talos/page_load_test/kraken/test-prefix.js
rename to talos/tests/kraken/test-prefix.js
rename from talos/page_load_test/quit.js
rename to talos/tests/quit.js
rename from talos/page_load_test/scroll/drac.htm
rename to talos/tests/scroll/drac.htm
rename from talos/page_load_test/scroll/iframe.svg
rename to talos/tests/scroll/iframe.svg
rename from talos/page_load_test/scroll/reader.css
rename to talos/tests/scroll/reader.css
rename from talos/page_load_test/scroll/reader.htm
rename to talos/tests/scroll/reader.htm
rename from talos/page_load_test/scroll/scroll-test.js
rename to talos/tests/scroll/scroll-test.js
--- a/talos/page_load_test/scroll/scroll-test.js
+++ b/talos/tests/scroll/scroll-test.js
@@ -1,10 +1,10 @@
 // Note: The content from here upto '// End scroll test' is duplicated at:
-//       - talos/page_load_test/scroll/scroll-test.js
+//       - talos/tests/scroll/scroll-test.js
 //       - inside talos/pageloader/chrome/tscroll.js
 //
 // - Please keep these copies in sync.
 // - Pleace make sure that any changes apply cleanly to all use cases.
 
 function testScroll(target, stepSize, opt_reportFunc, opt_numSteps)
 {
   var win;
rename from talos/page_load_test/scroll/scroll.js
rename to talos/tests/scroll/scroll.js
rename from talos/page_load_test/scroll/scroll.manifest
rename to talos/tests/scroll/scroll.manifest
--- a/talos/page_load_test/scroll/scroll.manifest
+++ b/talos/tests/scroll/scroll.manifest
@@ -1,6 +1,6 @@
-% http://localhost/page_load_test/scroll/tiled.html
-% http://localhost/page_load_test/scroll/tiled-fixed.html
-% http://localhost/page_load_test/scroll/tiled-downscale.html
-% http://localhost/page_load_test/scroll/tiled-fixed-downscale.html
-% http://localhost/page_load_test/scroll/iframe.svg
-% http://localhost/page_load_test/scroll/reader.htm
+% http://localhost/tests/scroll/tiled.html
+% http://localhost/tests/scroll/tiled-fixed.html
+% http://localhost/tests/scroll/tiled-downscale.html
+% http://localhost/tests/scroll/tiled-fixed-downscale.html
+% http://localhost/tests/scroll/iframe.svg
+% http://localhost/tests/scroll/reader.htm
rename from talos/page_load_test/scroll/strips-single.png
rename to talos/tests/scroll/strips-single.png
rename from talos/page_load_test/scroll/strips.png
rename to talos/tests/scroll/strips.png
rename from talos/page_load_test/scroll/tiled-downscale.html
rename to talos/tests/scroll/tiled-downscale.html
rename from talos/page_load_test/scroll/tiled-fixed-downscale.html
rename to talos/tests/scroll/tiled-fixed-downscale.html
rename from talos/page_load_test/scroll/tiled-fixed.html
rename to talos/tests/scroll/tiled-fixed.html
rename from talos/page_load_test/scroll/tiled.html
rename to talos/tests/scroll/tiled.html
rename from talos/page_load_test/svg_opacity/big-optimizable-group-opacity-2500.svg
rename to talos/tests/svg_opacity/big-optimizable-group-opacity-2500.svg
rename from talos/page_load_test/svg_opacity/small-group-opacity-2500.svg
rename to talos/tests/svg_opacity/small-group-opacity-2500.svg
rename from talos/page_load_test/svg_opacity/svg_opacity.manifest
rename to talos/tests/svg_opacity/svg_opacity.manifest
--- a/talos/page_load_test/svg_opacity/svg_opacity.manifest
+++ b/talos/tests/svg_opacity/svg_opacity.manifest
@@ -1,4 +1,4 @@
 # opacity tests
 
-http://localhost/page_load_test/svg_opacity/big-optimizable-group-opacity-2500.svg
-http://localhost/page_load_test/svg_opacity/small-group-opacity-2500.svg
+http://localhost/tests/svg_opacity/big-optimizable-group-opacity-2500.svg
+http://localhost/tests/svg_opacity/small-group-opacity-2500.svg
rename from talos/page_load_test/svgx/composite-scale-opacity.svg
rename to talos/tests/svgx/composite-scale-opacity.svg
rename from talos/page_load_test/svgx/composite-scale-rotate-opacity.svg
rename to talos/tests/svgx/composite-scale-rotate-opacity.svg
rename from talos/page_load_test/svgx/composite-scale-rotate.svg
rename to talos/tests/svgx/composite-scale-rotate.svg
rename from talos/page_load_test/svgx/composite-scale.svg
rename to talos/tests/svgx/composite-scale.svg
rename from talos/page_load_test/svgx/gearflowers.svg
rename to talos/tests/svgx/gearflowers.svg
rename from talos/page_load_test/svgx/hixie-001.xml
rename to talos/tests/svgx/hixie-001.xml
rename from talos/page_load_test/svgx/hixie-002.xml
rename to talos/tests/svgx/hixie-002.xml
rename from talos/page_load_test/svgx/hixie-003.xml
rename to talos/tests/svgx/hixie-003.xml
rename from talos/page_load_test/svgx/hixie-004.xml
rename to talos/tests/svgx/hixie-004.xml
rename from talos/page_load_test/svgx/hixie-005.xml
rename to talos/tests/svgx/hixie-005.xml
rename from talos/page_load_test/svgx/hixie-006.xml
rename to talos/tests/svgx/hixie-006.xml
rename from talos/page_load_test/svgx/hixie-007.xml
rename to talos/tests/svgx/hixie-007.xml
rename from talos/page_load_test/svgx/images/kyoto_1.jpg
rename to talos/tests/svgx/images/kyoto_1.jpg
rename from talos/page_load_test/svgx/images/kyoto_2.jpg
rename to talos/tests/svgx/images/kyoto_2.jpg
rename from talos/page_load_test/svgx/images/smallcats.gif
rename to talos/tests/svgx/images/smallcats.gif
rename from talos/page_load_test/svgx/svgm.manifest
rename to talos/tests/svgx/svgm.manifest
--- a/talos/page_load_test/svgx/svgm.manifest
+++ b/talos/tests/svgx/svgm.manifest
@@ -1,17 +1,17 @@
 # gearflowers image
-http://localhost/page_load_test/svgx/gearflowers.svg
+http://localhost/tests/svgx/gearflowers.svg
 
 # some generic image compositing tests
-http://localhost/page_load_test/svgx/composite-scale.svg
-http://localhost/page_load_test/svgx/composite-scale-opacity.svg
-http://localhost/page_load_test/svgx/composite-scale-rotate.svg
-http://localhost/page_load_test/svgx/composite-scale-rotate-opacity.svg
+http://localhost/tests/svgx/composite-scale.svg
+http://localhost/tests/svgx/composite-scale-opacity.svg
+http://localhost/tests/svgx/composite-scale-rotate.svg
+http://localhost/tests/svgx/composite-scale-rotate-opacity.svg
 
 # Painting multiple complex paths
-% http://localhost/page_load_test/svgx/hixie-001.xml
+% http://localhost/tests/svgx/hixie-001.xml
 # Painting text
-% http://localhost/page_load_test/svgx/hixie-003.xml
+% http://localhost/tests/svgx/hixie-003.xml
 # Painting linear gradients
-% http://localhost/page_load_test/svgx/hixie-005.xml
+% http://localhost/tests/svgx/hixie-005.xml
 # World Map
-% http://localhost/page_load_test/svgx/hixie-007.xml
+% http://localhost/tests/svgx/hixie-007.xml
rename from talos/page_load_test/svgx/svgx.manifest
rename to talos/tests/svgx/svgx.manifest
--- a/talos/page_load_test/svgx/svgx.manifest
+++ b/talos/tests/svgx/svgx.manifest
@@ -1,23 +1,23 @@
 # gearflowers image
-http://localhost/page_load_test/svgx/gearflowers.svg
+http://localhost/tests/svgx/gearflowers.svg
 
 # some generic image compositing tests
-http://localhost/page_load_test/svgx/composite-scale.svg
-http://localhost/page_load_test/svgx/composite-scale-opacity.svg
-http://localhost/page_load_test/svgx/composite-scale-rotate.svg
-http://localhost/page_load_test/svgx/composite-scale-rotate-opacity.svg
+http://localhost/tests/svgx/composite-scale.svg
+http://localhost/tests/svgx/composite-scale-opacity.svg
+http://localhost/tests/svgx/composite-scale-rotate.svg
+http://localhost/tests/svgx/composite-scale-rotate-opacity.svg
 
 # Painting multiple complex paths
-% http://localhost/page_load_test/svgx/hixie-001.xml
+% http://localhost/tests/svgx/hixie-001.xml
 # Painting multiple complex paths with transparency
-% http://localhost/page_load_test/svgx/hixie-002.xml
+% http://localhost/tests/svgx/hixie-002.xml
 # Painting text
-% http://localhost/page_load_test/svgx/hixie-003.xml
+% http://localhost/tests/svgx/hixie-003.xml
 # Painting images
-% http://localhost/page_load_test/svgx/hixie-004.xml
+% http://localhost/tests/svgx/hixie-004.xml
 # Painting linear gradients
-% http://localhost/page_load_test/svgx/hixie-005.xml
+% http://localhost/tests/svgx/hixie-005.xml
 # Painting radial gradients
-% http://localhost/page_load_test/svgx/hixie-006.xml
+% http://localhost/tests/svgx/hixie-006.xml
 # World Map
-% http://localhost/page_load_test/svgx/hixie-007.xml
+% http://localhost/tests/svgx/hixie-007.xml
rename from talos/page_load_test/tabswitch/bootstrap.js
rename to talos/tests/tabswitch/bootstrap.js
--- a/talos/page_load_test/tabswitch/bootstrap.js
+++ b/talos/tests/tabswitch/bootstrap.js
@@ -297,17 +297,17 @@ function handleFile(win, file) {
   let localURI = Services.io.newFileURI(localFile);
   let req = new win.XMLHttpRequest();
   req.open('get', localURI.spec, false);
   req.send(null);
 
 
   let testURLs = [];
   let server = Services.prefs.getCharPref("addon.test.tabswitch.webserver");
-  let parent = server + "/page_load_test/";
+  let parent = server + "/tests/";
   let lines = req.responseText.split('<a href=\"');
   testURLs = [];
   lines.forEach(function(a) {
     if (a.split('\"')[0] != "") {
       testURLs.push(parent + "tp5n/" + a.split('\"')[0]);
     }
   });
 
rename from talos/page_load_test/tabswitch/chrome.manifest
rename to talos/tests/tabswitch/chrome.manifest
rename from talos/page_load_test/tabswitch/content/options.xul
rename to talos/tests/tabswitch/content/options.xul
rename from talos/page_load_test/tabswitch/content/test.html
rename to talos/tests/tabswitch/content/test.html
rename from talos/page_load_test/tabswitch/install.rdf
rename to talos/tests/tabswitch/install.rdf
rename from talos/page_load_test/tabswitch/tps.manifest
rename to talos/tests/tabswitch/tps.manifest
rename from talos/page_load_test/tart/addon/chrome.manifest
rename to talos/tests/tart/addon/chrome.manifest
rename from talos/page_load_test/tart/addon/content/Profiler.js
rename to talos/tests/tart/addon/content/Profiler.js
--- a/talos/page_load_test/tart/addon/content/Profiler.js
+++ b/talos/tests/tart/addon/content/Profiler.js
@@ -1,17 +1,17 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 // - NOTE: This file is duplicated verbatim at:
 //         - talos/scripts/Profiler.js
 //         - talos/pageloader/chrome/Profiler.js
-//         - talos/page_load_test/devtools/addon/content/Profiler.js
-//         - talos/page_load_test/tart/addon/content/Profiler.js
+//         - talos/tests/devtools/addon/content/Profiler.js
+//         - talos/tests/tart/addon/content/Profiler.js
 //         - talos/startup_test/tresize/addon/content/Profiler.js
 //
 //  - Please keep these copies in sync.
 //  - Please make sure your changes apply cleanly to all use cases.
 
 // Finer grained profiler control
 //
 // Use this object to pause and resume the profiler so that it only profiles the
rename from talos/page_load_test/tart/addon/content/blank.icon.html
rename to talos/tests/tart/addon/content/blank.icon.html
rename from talos/page_load_test/tart/addon/content/framescript.js
rename to talos/tests/tart/addon/content/framescript.js
rename from talos/page_load_test/tart/addon/content/tab-min-width-1px.css
rename to talos/tests/tart/addon/content/tab-min-width-1px.css
rename from talos/page_load_test/tart/addon/content/tart.html
rename to talos/tests/tart/addon/content/tart.html
rename from talos/page_load_test/tart/addon/content/tart.ico
rename to talos/tests/tart/addon/content/tart.ico
rename from talos/page_load_test/tart/addon/content/tart.js
rename to talos/tests/tart/addon/content/tart.js
rename from talos/page_load_test/tart/addon/content/tart.overlay.xul
rename to talos/tests/tart/addon/content/tart.overlay.xul
rename from talos/page_load_test/tart/addon/install.rdf
rename to talos/tests/tart/addon/install.rdf
rename from talos/page_load_test/tart/cart.manifest
rename to talos/tests/tart/cart.manifest
rename from talos/page_load_test/tart/tart.manifest
rename to talos/tests/tart/tart.manifest
rename from talos/page_load_test/tp5o.html
rename to talos/tests/tp5o.html
rename from talos/page_load_test/v8_7/base.js
rename to talos/tests/v8_7/base.js
rename from talos/page_load_test/v8_7/crypto.js
rename to talos/tests/v8_7/crypto.js
rename from talos/page_load_test/v8_7/deltablue.js
rename to talos/tests/v8_7/deltablue.js
rename from talos/page_load_test/v8_7/earley-boyer.js
rename to talos/tests/v8_7/earley-boyer.js
rename from talos/page_load_test/v8_7/navier-stokes.js
rename to talos/tests/v8_7/navier-stokes.js
rename from talos/page_load_test/v8_7/raytrace.js
rename to talos/tests/v8_7/raytrace.js
rename from talos/page_load_test/v8_7/regexp.js
rename to talos/tests/v8_7/regexp.js
rename from talos/page_load_test/v8_7/revisions.html
rename to talos/tests/v8_7/revisions.html
rename from talos/page_load_test/v8_7/richards.js
rename to talos/tests/v8_7/richards.js
rename from talos/page_load_test/v8_7/run.html
rename to talos/tests/v8_7/run.html
rename from talos/page_load_test/v8_7/splay.js
rename to talos/tests/v8_7/splay.js
rename from talos/page_load_test/v8_7/style.css
rename to talos/tests/v8_7/style.css
rename from talos/page_load_test/v8_7/v8-logo.png
rename to talos/tests/v8_7/v8-logo.png
rename from talos/page_load_test/v8_7/v8.manifest
rename to talos/tests/v8_7/v8.manifest
--- a/talos/page_load_test/v8_7/v8.manifest
+++ b/talos/tests/v8_7/v8.manifest
@@ -1,1 +1,1 @@
-% http://localhost/page_load_test/v8_7/run.html
+% http://localhost/tests/v8_7/run.html
rename from talos/page_load_test/webgl/benchmarks/terrain/grass.jpeg
rename to talos/tests/webgl/benchmarks/terrain/grass.jpeg
rename from talos/page_load_test/webgl/benchmarks/terrain/perftest.html
rename to talos/tests/webgl/benchmarks/terrain/perftest.html
rename from talos/page_load_test/webgl/glterrain.manifest
rename to talos/tests/webgl/glterrain.manifest
--- a/talos/page_load_test/webgl/glterrain.manifest
+++ b/talos/tests/webgl/glterrain.manifest
@@ -1,1 +1,1 @@
-% http://localhost/page_load_test/webgl/benchmarks/terrain/perftest.html
+% http://localhost/tests/webgl/benchmarks/terrain/perftest.html
--- a/talos/xtalos/xperf_whitelist.json
+++ b/talos/xtalos/xperf_whitelist.json
@@ -1,17 +1,17 @@
 {"{firefox}\\Crash Reports\\{time}": {"ignore": true}, 
  "C:\\$Mft": {"ignore": true}, 
  "C:\\$Extend\\$UsnJrnl:$J": {"ignore": true}, 
  "C:\\Windows\\Prefetch\\{prefetch}.pf": {"ignore": true}, 
  "C:\\$Secure": {"ignore": true},
  "{firefox}\\omni.ja": {"mincount": 0, "maxcount": 46, "minbytes": 0, "maxbytes": 3014656},
  "{firefox}\\browser\\omni.ja": {"mincount": 0, "maxcount": 28, "minbytes": 0, "maxbytes": 1835008},
- "{talos}\\page_load_test\\tp5n\\tp5n.manifest": {"mincount": 0, "maxcount": 8, "minbytes": 0, "maxbytes": 32786}, 
- "{talos}\\page_load_test\\tp5n\\tp5n.manifest.develop": {"mincount": 0, "maxcount": 8, "minbytes": 0, "maxbytes": 32786},
+ "{talos}\\tests\\tp5n\\tp5n.manifest": {"mincount": 0, "maxcount": 8, "minbytes": 0, "maxbytes": 32786}, 
+ "{talos}\\tests\\tp5n\\tp5n.manifest.develop": {"mincount": 0, "maxcount": 8, "minbytes": 0, "maxbytes": 32786},
  "{profile}\\localstore.rdf": {"mincount": 2, "maxcount": 2, "minbytes": 8192, "maxbytes": 8192},
  "{firefox}\\dependentlibs.list": {"mincount": 4, "maxcount": 4, "minbytes": 16384, "maxbytes": 16384},
  "{profile}\\content-prefs.sqlite": {"mincount": 6, "maxcount": 6, "minbytes": 65768, "maxbytes": 65768}, 
  "{profile}\\extensions.ini": {"mincount": 2, "maxcount": 2, "minbytes": 8192, "maxbytes": 8192},
  "{profile}\\extensions\\pageloader@mozilla.org\\chrome.manifest": {"mincount": 2, "maxcount": 2, "minbytes": 600, "maxbytes": 600},
  "{profile}\\extensions\\talos-powers@mozilla.org\\chrome.manifest": {"mincount": 2, "maxcount": 2, "minbytes": 600, "maxbytes": 600},
  "{profile}\\extensions\\talos-powers@mozilla.org\\chrome\\talos-powers-content.js": {"mincount": 2, "maxcount": 2, "minbytes": 2000, "maxbytes": 2000},
  "{profile}\\mimetypes.rdf": {"mincount": 2, "maxcount": 2, "minbytes": 8192, "maxbytes": 8192},