--- a/toolkit/components/aboutmemory/Makefile.in
+++ b/toolkit/components/aboutmemory/Makefile.in
@@ -38,13 +38,11 @@
 
 DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-ifdef ENABLE_TESTS
-DIRS += tests/chrome
-endif
+TEST_DIRS = tests
 
 include $(topsrcdir)/config/rules.mk

rename from toolkit/components/aboutmemory/tests/chrome/Makefile.in
rename to toolkit/components/aboutmemory/tests/Makefile.in
--- a/toolkit/components/aboutmemory/tests/chrome/Makefile.in
+++ b/toolkit/components/aboutmemory/tests/Makefile.in
@@ -30,21 +30,21 @@
 # use your version of this file under the terms of the MPL, indicate your
 # decision by deleting the provisions above and replace them with the notice
 # and other provisions required by the GPL or the LGPL. If you do not delete
 # the provisions above, a recipient may use your version of this file under
 # the terms of any one of the MPL, the GPL or the LGPL.
 #
 # ***** END LICENSE BLOCK *****
 
-DEPTH		= ../../../../..
+DEPTH		= ../../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir  = toolkit/components/aboutmemory/tests/chrome
+relativesrcdir  = toolkit/components/aboutmemory/tests
 
 include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/rules.mk
 
 _CHROME_FILES	= \
 		test_aboutmemory.xul \
 		test_asyncClose_leak.xul \
 		$(NULL)

rename from toolkit/components/aboutmemory/tests/chrome/test_aboutmemory.xul
rename to toolkit/components/aboutmemory/tests/test_aboutmemory.xul

rename from toolkit/components/aboutmemory/tests/chrome/test_asyncClose_leak.xul
rename to toolkit/components/aboutmemory/tests/test_asyncClose_leak.xul