--- a/accessible/Makefile.in
+++ b/accessible/Makefile.in
@@ -38,12 +38,16 @@
 DEPTH   = ..
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH   = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE	= accessibility
-DIRS    = public src build tests
+DIRS    = public src build
+
+ifdef ENABLE_TESTS
+DIRS    += tests
+endif
 
 include $(topsrcdir)/config/rules.mk
 

--- a/accessible/tests/Makefile.in
+++ b/accessible/tests/Makefile.in
@@ -40,14 +40,12 @@ DEPTH   = ../..
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH   = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE	= test_accessibility
 
-ifdef ENABLE_TESTS
-DIRS		+= mochitest
-endif
+DIRS	= mochitest
 
 include $(topsrcdir)/config/rules.mk
 

--- a/security/manager/ssl/Makefile.in
+++ b/security/manager/ssl/Makefile.in
@@ -37,11 +37,15 @@
 # ***** END LICENSE BLOCK *****
 
 DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 MODULE		= pipnss
-DIRS		  = src public tests
+DIRS		= src public
+
+ifdef ENABLE_TESTS
+DIRS		+= tests
+endif
 
 include $(topsrcdir)/config/rules.mk

--- a/toolkit/components/commandlines/Makefile.in
+++ b/toolkit/components/commandlines/Makefile.in
@@ -40,12 +40,15 @@ topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 DIRS = \
 	public \
 	src \
-	test \
 	$(NULL)
 
+ifdef ENABLE_TESTS
+DIRS += test
+endif
+
 include $(topsrcdir)/config/rules.mk

--- a/toolkit/components/downloads/Makefile.in
+++ b/toolkit/components/downloads/Makefile.in
@@ -37,12 +37,16 @@
 
 DEPTH   = ../../..
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH   = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS = public src test
+DIRS = public src
+
+ifdef ENABLE_TESTS
+DIRS += test
+endif
 
 include $(topsrcdir)/config/rules.mk
 

--- a/toolkit/components/satchel/Makefile.in
+++ b/toolkit/components/satchel/Makefile.in
@@ -37,11 +37,15 @@
 
 DEPTH   = ../../..
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH   = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS = public src test
+DIRS = public src
+
+ifdef ENABLE_TESTS
+DIRS += test
+endif
 
 include $(topsrcdir)/config/rules.mk