--- a/dom/devicestorage/Makefile.in
+++ b/dom/devicestorage/Makefile.in
@@ -27,14 +27,16 @@ EXPORTS         = \
 
 LOCAL_INCLUDES = \
 		-I$(topsrcdir)/dom/base \
 		-I$(topsrcdir)/dom/ipc \
 		-I$(topsrcdir)/content/base/src \
 		-I$(topsrcdir)/content/events/src \
 		$(NULL)
 
+TEST_DIRS += test
+
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 include $(topsrcdir)/config/rules.mk
 
 DEFINES += -D_IMPL_NS_LAYOUT
 

rename from dom/tests/mochitest/devicestorage/Makefile.in
rename to dom/devicestorage/test/Makefile.in
--- a/dom/tests/mochitest/devicestorage/Makefile.in
+++ b/dom/devicestorage/test/Makefile.in
@@ -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/.
 
-DEPTH		= ../../../..
+DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir	= dom/tests/mochitest/devicestorage
+relativesrcdir	= dom/devicestorage/test/
 
 include $(DEPTH)/config/autoconf.mk
 
 include $(topsrcdir)/config/rules.mk
 
 _TEST_FILES	= \
 		test_sanity.html \
 		test_basic.html \

rename from dom/tests/mochitest/devicestorage/devicestorage_common.js
rename to dom/devicestorage/test/devicestorage_common.js

rename from dom/tests/mochitest/devicestorage/test_basic.html
rename to dom/devicestorage/test/test_basic.html

rename from dom/tests/mochitest/devicestorage/test_dotdot.html
rename to dom/devicestorage/test/test_dotdot.html

rename from dom/tests/mochitest/devicestorage/test_enumerate.html
rename to dom/devicestorage/test/test_enumerate.html

rename from dom/tests/mochitest/devicestorage/test_enumerateMultipleContinue.html
rename to dom/devicestorage/test/test_enumerateMultipleContinue.html

rename from dom/tests/mochitest/devicestorage/test_enumerateNoParam.html
rename to dom/devicestorage/test/test_enumerateNoParam.html

rename from dom/tests/mochitest/devicestorage/test_enumerateOptions.html
rename to dom/devicestorage/test/test_enumerateOptions.html

rename from dom/tests/mochitest/devicestorage/test_lastModificationFilter.html
rename to dom/devicestorage/test/test_lastModificationFilter.html

rename from dom/tests/mochitest/devicestorage/test_overwrite.html
rename to dom/devicestorage/test/test_overwrite.html

rename from dom/tests/mochitest/devicestorage/test_sanity.html
rename to dom/devicestorage/test/test_sanity.html

--- a/dom/tests/mochitest/Makefile.in
+++ b/dom/tests/mochitest/Makefile.in
@@ -13,17 +13,16 @@ include $(DEPTH)/config/autoconf.mk
 DIRS	+= \
 	dom-level0 \
 	dom-level1-core \
 	dom-level2-core \
 	dom-level2-html \
 	ajax \
 	bugs \
 	chrome \
-	devicestorage \
 	general \
 	whatwg \
 	geolocation \
 	localstorage \
 	orientation \
 	sessionstorage \
 	storageevent \
 	pointerlock \