diff --git a/tests/functional.js b/tests/functional.js
index 146c748b76..3777b817b6 100644
--- a/tests/functional.js
+++ b/tests/functional.js
@@ -1,5 +1,5 @@
 // Listing of all the infrastructure functional tests
 define([
-	"./TabIndex",
-	"./KeyNav"
+	"./functional/TabIndex",
+	"./functional/KeyNav"
 ]);
diff --git a/tests/KeyNav.js b/tests/functional/KeyNav.js
similarity index 100%
rename from tests/KeyNav.js
rename to tests/functional/KeyNav.js
diff --git a/tests/KeyNavTests.html b/tests/functional/KeyNavTests.html
similarity index 97%
rename from tests/KeyNavTests.html
rename to tests/functional/KeyNavTests.html
index 991d3a8a5c..df94d27ec1 100644
--- a/tests/KeyNavTests.html
+++ b/tests/functional/KeyNavTests.html
@@ -5,7 +5,7 @@
 <meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,minimum-scale=1,user-scalable=no" />
 <meta name="apple-mobile-web-app-capable" content="yes" />
 <title>KeyNav Tests</title>
-<script type="text/javascript" src="./boilerplate.js"></script>
+<script type="text/javascript" src="../boilerplate.js"></script>
 <script language="JavaScript" type="text/javascript">
 	var ready = false; // set to true when the test page is ready
 	require([
diff --git a/tests/TabIndex.html b/tests/functional/TabIndex.html
similarity index 97%
rename from tests/TabIndex.html
rename to tests/functional/TabIndex.html
index 19a3068d05..5993403b33 100644
--- a/tests/TabIndex.html
+++ b/tests/functional/TabIndex.html
@@ -8,7 +8,7 @@
 			display: block;
 		}
 	</style>
-	<script type="text/javascript" src="boilerplate.js"></script>
+	<script type="text/javascript" src="../boilerplate.js"></script>
 	<script language="JavaScript" type="text/javascript">
 		var ready = false; // set to true when the test page is ready
 		var timeoutInterval = 1000;
diff --git a/tests/TabIndex.js b/tests/functional/TabIndex.js
similarity index 100%
rename from tests/TabIndex.js
rename to tests/functional/TabIndex.js
diff --git a/tests/sauce.js b/tests/sauce.js
index 7e819df0ff..a676ea5588 100644
--- a/tests/sauce.js
+++ b/tests/sauce.js
@@ -64,6 +64,8 @@ define({
 	// Functional test suite(s) to run in each browser once non-functional tests are completed
 	functionalSuites: [ "delite/tests/functional" ],
 
+	reporters : ["console"],
+
 	// A regular expression matching URLs to files that should not be included in code coverage analysis
 	excludeInstrumentation: /^(requirejs|dcl|dojo|delite\/tests)/
 });
diff --git a/tests/unit.js b/tests/unit.js
index da2967143e..7f5e4fc1e6 100644
--- a/tests/unit.js
+++ b/tests/unit.js
@@ -1,21 +1,21 @@
 // Listing of all the infrastructure unit tests
 define([
-	"./Destroyable",
-	"./DisplayContainer",
-	"./register",
-	"./Widget-attr",
-	"./handlebars",
-	"./Widget-lifecycle",
-	"./Widget-placeAt",
-	"./Widget-utility",
-	"./HasDropDown",
-	"./CssState",
-	"./Container",
-	"./a11y",
-	"./Widget-on",
-	"./Stateful",
-	"./Selection",
-	"./StoreMap",
-	"./Store",
-	"./Scrollable"
+	"./unit/Destroyable",
+	"./unit/DisplayContainer",
+	"./unit/register",
+	"./unit/Widget-attr",
+	"./unit/handlebars",
+	"./unit/Widget-lifecycle",
+	"./unit/Widget-placeAt",
+	"./unit/Widget-utility",
+	"./unit/HasDropDown",
+	"./unit/CssState",
+	"./unit/Container",
+	"./unit/a11y",
+	"./unit/Widget-on",
+	"./unit/Stateful",
+	"./unit/Selection",
+	"./unit/StoreMap",
+	"./unit/Store",
+	"./unit/Scrollable"
 ]);
diff --git a/tests/Container.js b/tests/unit/Container.js
similarity index 98%
rename from tests/Container.js
rename to tests/unit/Container.js
index 9b65cccb50..93f8a1f548 100644
--- a/tests/Container.js
+++ b/tests/unit/Container.js
@@ -1,11 +1,11 @@
 define([
 	"intern!object",
 	"intern/chai!assert",
-	"../a11y",
-	"../focus",
-	"../register",
-	"../Widget",
-	"../Container"
+	"delite/a11y",
+	"delite/focus",
+	"delite/register",
+	"delite/Widget",
+	"delite/Container"
 ], function (registerSuite, assert, a11y, focus, register, Widget, Container) {
 	var container, PlainWidget, TestContainer, TestContained, html, zero, two, four;
 	/*jshint multistr: true */
diff --git a/tests/CssState.js b/tests/unit/CssState.js
similarity index 97%
rename from tests/CssState.js
rename to tests/unit/CssState.js
index 7fe2b45446..23f49ec768 100644
--- a/tests/CssState.js
+++ b/tests/unit/CssState.js
@@ -2,8 +2,8 @@ define([
 	"intern!object",
 	"intern/chai!assert",
 	"dojo/dom-class",
-	"../register",
-	"../CssState"
+	"delite/register",
+	"delite/CssState"
 ], function (registerSuite, assert, domClass, register, CssState) {
 	registerSuite({
 		name: "CssState",
diff --git a/tests/Destroyable.js b/tests/unit/Destroyable.js
similarity index 100%
rename from tests/Destroyable.js
rename to tests/unit/Destroyable.js
diff --git a/tests/DisplayContainer.js b/tests/unit/DisplayContainer.js
similarity index 97%
rename from tests/DisplayContainer.js
rename to tests/unit/DisplayContainer.js
index ee65fc9714..cadb715dde 100644
--- a/tests/DisplayContainer.js
+++ b/tests/unit/DisplayContainer.js
@@ -4,9 +4,9 @@ define([
 	"intern/chai!assert",
 	"dojo/on",
 	"dojo/Deferred",
-	"../DisplayContainer",
-	"../Widget",
-	"../register",
+	"delite/DisplayContainer",
+	"delite/Widget",
+	"delite/register",
 	"dojo/domReady!"
 ], function (require, registerSuite, assert, on, Deferred, DisplayContainer, Widget, register) {
 	var container;
diff --git a/tests/HasDropDown.js b/tests/unit/HasDropDown.js
similarity index 98%
rename from tests/HasDropDown.js
rename to tests/unit/HasDropDown.js
index 5d12479448..5c32bdcf9b 100644
--- a/tests/HasDropDown.js
+++ b/tests/unit/HasDropDown.js
@@ -3,10 +3,10 @@ define([
 	"intern/chai!assert",
 	"dojo/keys",
 	"dojo/on",
-	"../register",
-	"../HasDropDown",
-	"../Widget",
-	"./helpers"
+	"delite/register",
+	"delite/HasDropDown",
+	"delite/Widget",
+	"../helpers"
 ], function (registerSuite, assert, keys, on, register, HasDropDown, Widget, helpers) {
 	var container, SimplePopup, SimpleDropDownButton, NonFocusableDropDownButton, popup, dd, ndd;
 
diff --git a/tests/Scrollable.js b/tests/unit/Scrollable.js
similarity index 98%
rename from tests/Scrollable.js
rename to tests/unit/Scrollable.js
index 85f49b04bf..524efa238e 100644
--- a/tests/Scrollable.js
+++ b/tests/unit/Scrollable.js
@@ -6,8 +6,8 @@ define([
 	"delite/register",
 	"delite/Widget",
 	"delite/Scrollable",
-	"./ScrollableTestContainer",
-	"./Scrollable-shared"
+	"../ScrollableTestContainer",
+	"../Scrollable-shared"
 ], function (dcl, registerSuite, assert, domClass, register, Widget, 
 	Scrollable, ScrollableTestContainer, ScrollableSharedTests) {
 		
diff --git a/tests/Selection.js b/tests/unit/Selection.js
similarity index 96%
rename from tests/Selection.js
rename to tests/unit/Selection.js
index c0f5a10f6c..23f60bf5da 100644
--- a/tests/Selection.js
+++ b/tests/unit/Selection.js
@@ -1,8 +1,8 @@
 define([
 	"intern!object",
 	"intern/chai!assert",
-	"../register",
-	"../Selection"
+	"delite/register",
+	"delite/Selection"
 ], function (registerSuite, assert, register, Selection) {
 	var C = register("test-selection", [HTMLElement, Selection], {
 		updateRenderers: function () {
diff --git a/tests/Stateful.js b/tests/unit/Stateful.js
similarity index 99%
rename from tests/Stateful.js
rename to tests/unit/Stateful.js
index 8b4124e281..d18ed2f258 100644
--- a/tests/Stateful.js
+++ b/tests/unit/Stateful.js
@@ -1,7 +1,7 @@
 define([
 	"intern!object",
 	"intern/chai!assert",
-	"../Stateful",
+	"delite/Stateful",
 	"dcl/dcl"
 ], function (registerSuite, assert, Stateful, dcl) {
 	registerSuite({
diff --git a/tests/Store.js b/tests/unit/Store.js
similarity index 98%
rename from tests/Store.js
rename to tests/unit/Store.js
index a1426c0b16..87d6cfc397 100644
--- a/tests/Store.js
+++ b/tests/unit/Store.js
@@ -1,7 +1,9 @@
 define([
 	"intern!object",
 	"intern/chai!assert",
-	"../register", "../Widget", "../Store",
+	"delite/register",
+	"delite/Widget",
+	"delite/Store",
 	"dojo/store/Observable", "dojo/store/JsonRest", "dojo/store/Memory"
 ], function (registerSuite, assert, register, Widget, Store, Observable, JsonRest, Memory) {
 	var C = register("test-store", [HTMLElement, Widget, Store]);
diff --git a/tests/StoreMap.js b/tests/unit/StoreMap.js
similarity index 99%
rename from tests/StoreMap.js
rename to tests/unit/StoreMap.js
index c038271379..4e465c4b6d 100644
--- a/tests/StoreMap.js
+++ b/tests/unit/StoreMap.js
@@ -1,9 +1,9 @@
 define([
 	"intern!object",
 	"intern/chai!assert",
-	"../register",
-	"../Widget",
-	"../StoreMap",
+	"delite/register",
+	"delite/Widget",
+	"delite/StoreMap",
 	"dojo/store/Observable",
 	"dojo/store/JsonRest",
 	"dojo/store/Memory"
diff --git a/tests/Widget-attr.js b/tests/unit/Widget-attr.js
similarity index 99%
rename from tests/Widget-attr.js
rename to tests/unit/Widget-attr.js
index f0f153953d..442c9e9857 100644
--- a/tests/Widget-attr.js
+++ b/tests/unit/Widget-attr.js
@@ -1,9 +1,9 @@
 define([
 	"intern!object",
 	"intern/chai!assert",
-	"../register",
+	"delite/register",
 	"dojo/sniff",
-	"../Widget",
+	"delite/Widget",
 	"dojo/domReady!"
 ], function (registerSuite, assert, register, has, Widget) {
 	var container;
diff --git a/tests/Widget-lifecycle.js b/tests/unit/Widget-lifecycle.js
similarity index 98%
rename from tests/Widget-lifecycle.js
rename to tests/unit/Widget-lifecycle.js
index c936146306..1b43d653af 100644
--- a/tests/Widget-lifecycle.js
+++ b/tests/unit/Widget-lifecycle.js
@@ -3,8 +3,8 @@ define([
 	"intern/chai!assert",
 	"dojo/aspect",
 	"dojo/dom-class",
-	"../register",
-	"../Widget"
+	"delite/register",
+	"delite/Widget"
 ], function (registerSuite, assert, aspect, domClass, register, Widget) {
 	var container, TestWidget, w;
 	var obj = {
diff --git a/tests/Widget-on.js b/tests/unit/Widget-on.js
similarity index 98%
rename from tests/Widget-on.js
rename to tests/unit/Widget-on.js
index 466ee36167..4ca7a2044c 100644
--- a/tests/Widget-on.js
+++ b/tests/unit/Widget-on.js
@@ -1,8 +1,8 @@
 define([
 	"intern!object",
 	"intern/chai!assert",
-	"../register",
-	"../Widget"
+	"delite/register",
+	"delite/Widget"
 ], function (registerSuite, assert, register, Widget) {
 	var container, html;
 	/*jshint multistr: true */
diff --git a/tests/Widget-placeAt.js b/tests/unit/Widget-placeAt.js
similarity index 98%
rename from tests/Widget-placeAt.js
rename to tests/unit/Widget-placeAt.js
index d583e4a1af..2a0e384586 100644
--- a/tests/Widget-placeAt.js
+++ b/tests/unit/Widget-placeAt.js
@@ -2,8 +2,8 @@ define([
 	"intern!object",
 	"intern/chai!assert",
 	"dojo/aspect",
-	"../register",
-	"../Widget",
+	"delite/register",
+	"delite/Widget",
 	"deliteful/Button"		// TODO: remove dependency on deliteful
 ], function (registerSuite, assert, aspect, register, Widget, Button) {
 	var container, SimpleWidget, simple, pane1, pane2, pane3, pane4;
diff --git a/tests/Widget-utility.js b/tests/unit/Widget-utility.js
similarity index 98%
rename from tests/Widget-utility.js
rename to tests/unit/Widget-utility.js
index c6e99cf9b7..30b1565e50 100644
--- a/tests/Widget-utility.js
+++ b/tests/unit/Widget-utility.js
@@ -1,8 +1,8 @@
 define([
 	"intern!object",
 	"intern/chai!assert",
-	"../register",
-	"../Widget"
+	"delite/register",
+	"delite/Widget"
 ], function (registerSuite, assert, register, Widget) {
 	var container, html;
 	/*jshint multistr: true */
diff --git a/tests/a11y.js b/tests/unit/a11y.js
similarity index 99%
rename from tests/a11y.js
rename to tests/unit/a11y.js
index 8e944946db..d7bb370cf2 100644
--- a/tests/a11y.js
+++ b/tests/unit/a11y.js
@@ -1,9 +1,9 @@
 define([
 	"intern!object",
 	"intern/chai!assert",
-	"../a11y",
+	"delite/a11y",
 	"dojo/sniff",
-	"dojo/text!./resources/a11y.html"
+	"dojo/text!../resources/a11y.html"
 ], function (registerSuite, assert, a11y, has, html) {
 	var container;
 		registerSuite({
diff --git a/tests/handlebars.js b/tests/unit/handlebars.js
similarity index 97%
rename from tests/handlebars.js
rename to tests/unit/handlebars.js
index a8bdacb43f..92b7330126 100644
--- a/tests/handlebars.js
+++ b/tests/unit/handlebars.js
@@ -1,11 +1,11 @@
 define([
 	"intern!object",
 	"intern/chai!assert",
-	"../handlebars",
-	"../register",
-	"../Widget",
-	"../handlebars!./templates/SimpleHandleBarsButton.html",
-	"../handlebars!./templates/HandlebarsButton.html"
+	"delite/handlebars",
+	"delite/register",
+	"delite/Widget",
+	"delite/handlebars!../templates/SimpleHandleBarsButton.html",
+	"delite/handlebars!../templates/HandlebarsButton.html"
 ], function (registerSuite, assert, handlebars, register, Widget, simpleHBTmpl, buttonHBTmpl) {
 	var container, myButton;
 	registerSuite({
diff --git a/tests/register.js b/tests/unit/register.js
similarity index 99%
rename from tests/register.js
rename to tests/unit/register.js
index 5da61fdad7..b707e5f165 100644
--- a/tests/register.js
+++ b/tests/unit/register.js
@@ -1,8 +1,8 @@
 define([
 	"intern!object",
 	"intern/chai!assert",
-	"../register",
-	"../Stateful",
+	"delite/register",
+	"delite/Stateful",
 	"dojo/domReady!"
 ], function (registerSuite, assert, register, Stateful) {