diff --git a/toolkit/components/startup/Makefile.in b/toolkit/components/startup/Makefile.in
index ba2e78ea62cb..a6d10475ecec 100644
--- a/toolkit/components/startup/Makefile.in
+++ b/toolkit/components/startup/Makefile.in
@@ -70,10 +70,8 @@ endif
 endif
 endif
 
-ifdef ENABLE_TESTS
 ifneq (mobile,$(MOZ_BUILD_APP))
-DIRS += tests/browser
-endif
+TEST_DIRS = tests
 endif
 
 include $(topsrcdir)/config/rules.mk
diff --git a/toolkit/components/startup/tests/browser/Makefile.in b/toolkit/components/startup/tests/Makefile.in
similarity index 96%
rename from toolkit/components/startup/tests/browser/Makefile.in
rename to toolkit/components/startup/tests/Makefile.in
index 9be8cf5ffcc0..3970cb85bb94 100644
--- a/toolkit/components/startup/tests/browser/Makefile.in
+++ b/toolkit/components/startup/tests/Makefile.in
@@ -35,11 +35,11 @@
 #
 # ***** END LICENSE BLOCK *****
 
-DEPTH		= ../../../../..
+DEPTH		= ../../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir  = toolkit/components/startup/tests/browser
+relativesrcdir  = toolkit/components/startup/tests
 
 include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/rules.mk
diff --git a/toolkit/components/startup/tests/browser/beforeunload.html b/toolkit/components/startup/tests/beforeunload.html
similarity index 100%
rename from toolkit/components/startup/tests/browser/beforeunload.html
rename to toolkit/components/startup/tests/beforeunload.html
diff --git a/toolkit/components/startup/tests/browser/browser_bug511456.js b/toolkit/components/startup/tests/browser_bug511456.js
similarity index 99%
rename from toolkit/components/startup/tests/browser/browser_bug511456.js
rename to toolkit/components/startup/tests/browser_bug511456.js
index 5b6ec5bb8198..365ae5f7dccc 100644
--- a/toolkit/components/startup/tests/browser/browser_bug511456.js
+++ b/toolkit/components/startup/tests/browser_bug511456.js
@@ -36,7 +36,7 @@
  * ***** END LICENSE BLOCK ***** */
 
 const PROMPT_URL = "chrome://global/content/commonDialog.xul";
-const TEST_URL = "http://example.com/browser/toolkit/components/startup/tests/browser/beforeunload.html";
+const TEST_URL = "http://example.com/browser/toolkit/components/startup/tests/beforeunload.html";
 
 var Watcher = {
   seen: false,
diff --git a/toolkit/components/startup/tests/browser/browser_bug537449.js b/toolkit/components/startup/tests/browser_bug537449.js
similarity index 99%
rename from toolkit/components/startup/tests/browser/browser_bug537449.js
rename to toolkit/components/startup/tests/browser_bug537449.js
index b0c77c757cde..c53b848deb06 100644
--- a/toolkit/components/startup/tests/browser/browser_bug537449.js
+++ b/toolkit/components/startup/tests/browser_bug537449.js
@@ -36,7 +36,7 @@
  * ***** END LICENSE BLOCK ***** */
 
 const PROMPT_URL = "chrome://global/content/commonDialog.xul";
-const TEST_URL = "http://example.com/browser/toolkit/components/startup/tests/browser/beforeunload.html";
+const TEST_URL = "http://example.com/browser/toolkit/components/startup/tests/beforeunload.html";
 
 var Watcher = {
   seen: false,