diff --git a/Makefile.in b/Makefile.in
index 8e009f1dd3bf..0b80f7c2c015 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -277,7 +277,7 @@ tier_50_dirs	+= security/manager
 endif
 
 ifdef MOZ_STORAGE
-tier_50_dirs += db/sqlite3/src storage
+tier_50_dirs += storage
 endif
 
 ifdef MOZ_LDAP_XPCOM
diff --git a/storage/Makefile.in b/storage/Makefile.in
index 5c5bf7562da2..db6d1a942723 100644
--- a/storage/Makefile.in
+++ b/storage/Makefile.in
@@ -44,7 +44,15 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= storage
-DIRS		= public src build test
+DIRS		= ../db/sqlite3/src \
+		  public \
+		  src \
+		  build \
+		  $(NULL)
+
+ifdef ENABLE_TESTS
+DIRS		= test
+endif
 
 include $(topsrcdir)/config/rules.mk