diff --git a/addon-sdk/Makefile.in b/addon-sdk/Makefile.in
index ea9f561a053..37c41b33988 100644
--- a/addon-sdk/Makefile.in
+++ b/addon-sdk/Makefile.in
@@ -9,8 +9,6 @@ VPATH     = @srcdir@
 
 include $(topsrcdir)/config/config.mk
 
-TEST_DIRS += test
-
 libs::
 	$(PYTHON) $(srcdir)/copy_source.py $(topsrcdir) $(srcdir)/source/lib $(FINAL_TARGET)/modules/commonjs >copy_source.mk
 	$(MAKE) -f copy_source.mk libs
diff --git a/addon-sdk/moz.build b/addon-sdk/moz.build
new file mode 100644
index 00000000000..fb0e881f427
--- /dev/null
+++ b/addon-sdk/moz.build
@@ -0,0 +1,7 @@
+# vim: set filetype=python:
+# 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/.
+
+TEST_DIRS += ['test']
+
diff --git a/addon-sdk/test/moz.build b/addon-sdk/test/moz.build
new file mode 100644
index 00000000000..58ce5e27339
--- /dev/null
+++ b/addon-sdk/test/moz.build
@@ -0,0 +1,5 @@
+# vim: set filetype=python:
+# 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/.
+
diff --git a/chrome/Makefile.in b/chrome/Makefile.in
index d96f6073a39..0c112ea4ab9 100644
--- a/chrome/Makefile.in
+++ b/chrome/Makefile.in
@@ -9,10 +9,5 @@ srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
-
-DIRS = public src
-
-TEST_DIRS += test
-
 include $(topsrcdir)/config/rules.mk
 
diff --git a/chrome/moz.build b/chrome/moz.build
new file mode 100644
index 00000000000..bd475548c13
--- /dev/null
+++ b/chrome/moz.build
@@ -0,0 +1,7 @@
+# vim: set filetype=python:
+# 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/.
+
+DIRS += ['public', 'src']
+TEST_DIRS += ['test']
diff --git a/chrome/public/moz.build b/chrome/public/moz.build
new file mode 100644
index 00000000000..58ce5e27339
--- /dev/null
+++ b/chrome/public/moz.build
@@ -0,0 +1,5 @@
+# vim: set filetype=python:
+# 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/.
+
diff --git a/chrome/src/moz.build b/chrome/src/moz.build
new file mode 100644
index 00000000000..58ce5e27339
--- /dev/null
+++ b/chrome/src/moz.build
@@ -0,0 +1,5 @@
+# vim: set filetype=python:
+# 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/.
+
diff --git a/chrome/test/moz.build b/chrome/test/moz.build
new file mode 100644
index 00000000000..58ce5e27339
--- /dev/null
+++ b/chrome/test/moz.build
@@ -0,0 +1,5 @@
+# vim: set filetype=python:
+# 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/.
+
diff --git a/db/sqlite3/src/moz.build b/db/sqlite3/src/moz.build
new file mode 100644
index 00000000000..58ce5e27339
--- /dev/null
+++ b/db/sqlite3/src/moz.build
@@ -0,0 +1,5 @@
+# vim: set filetype=python:
+# 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/.
+
diff --git a/dbm/include/moz.build b/dbm/include/moz.build
new file mode 100644
index 00000000000..58ce5e27339
--- /dev/null
+++ b/dbm/include/moz.build
@@ -0,0 +1,5 @@
+# vim: set filetype=python:
+# 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/.
+
diff --git a/dbm/moz.build b/dbm/moz.build
new file mode 100644
index 00000000000..58ce5e27339
--- /dev/null
+++ b/dbm/moz.build
@@ -0,0 +1,5 @@
+# vim: set filetype=python:
+# 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/.
+
diff --git a/dbm/src/moz.build b/dbm/src/moz.build
new file mode 100644
index 00000000000..58ce5e27339
--- /dev/null
+++ b/dbm/src/moz.build
@@ -0,0 +1,5 @@
+# vim: set filetype=python:
+# 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/.
+
diff --git a/dbm/tests/moz.build b/dbm/tests/moz.build
new file mode 100644
index 00000000000..58ce5e27339
--- /dev/null
+++ b/dbm/tests/moz.build
@@ -0,0 +1,5 @@
+# vim: set filetype=python:
+# 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/.
+
diff --git a/hal/moz.build b/hal/moz.build
new file mode 100644
index 00000000000..58ce5e27339
--- /dev/null
+++ b/hal/moz.build
@@ -0,0 +1,5 @@
+# vim: set filetype=python:
+# 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/.
+
diff --git a/mobile/locales/moz.build b/mobile/locales/moz.build
new file mode 100644
index 00000000000..58ce5e27339
--- /dev/null
+++ b/mobile/locales/moz.build
@@ -0,0 +1,5 @@
+# vim: set filetype=python:
+# 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/.
+
diff --git a/other-licenses/android/moz.build b/other-licenses/android/moz.build
new file mode 100644
index 00000000000..58ce5e27339
--- /dev/null
+++ b/other-licenses/android/moz.build
@@ -0,0 +1,5 @@
+# vim: set filetype=python:
+# 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/.
+
diff --git a/other-licenses/bsdiff/moz.build b/other-licenses/bsdiff/moz.build
new file mode 100644
index 00000000000..58ce5e27339
--- /dev/null
+++ b/other-licenses/bsdiff/moz.build
@@ -0,0 +1,5 @@
+# vim: set filetype=python:
+# 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/.
+
diff --git a/other-licenses/skia-npapi/moz.build b/other-licenses/skia-npapi/moz.build
new file mode 100644
index 00000000000..58ce5e27339
--- /dev/null
+++ b/other-licenses/skia-npapi/moz.build
@@ -0,0 +1,5 @@
+# vim: set filetype=python:
+# 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/.
+
diff --git a/other-licenses/snappy/moz.build b/other-licenses/snappy/moz.build
new file mode 100644
index 00000000000..58ce5e27339
--- /dev/null
+++ b/other-licenses/snappy/moz.build
@@ -0,0 +1,5 @@
+# vim: set filetype=python:
+# 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/.
+
diff --git a/probes/moz.build b/probes/moz.build
new file mode 100644
index 00000000000..58ce5e27339
--- /dev/null
+++ b/probes/moz.build
@@ -0,0 +1,5 @@
+# vim: set filetype=python:
+# 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/.
+
diff --git a/startupcache/Makefile.in b/startupcache/Makefile.in
index ff290ad592a..fb7e15ef57d 100644
--- a/startupcache/Makefile.in
+++ b/startupcache/Makefile.in
@@ -10,12 +10,6 @@ VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS = $(NULL)
-
-ifdef ENABLE_TESTS
-TOOL_DIRS += test
-endif
-
 MODULE = startupcache
 MODULE_NAME = StartupCacheModule
 LIBRARY_NAME = startupcache
diff --git a/startupcache/moz.build b/startupcache/moz.build
new file mode 100644
index 00000000000..75980e46ba9
--- /dev/null
+++ b/startupcache/moz.build
@@ -0,0 +1,6 @@
+# vim: set filetype=python:
+# 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/.
+
+TEST_TOOL_DIRS += ['test']
diff --git a/startupcache/test/moz.build b/startupcache/test/moz.build
new file mode 100644
index 00000000000..58ce5e27339
--- /dev/null
+++ b/startupcache/test/moz.build
@@ -0,0 +1,5 @@
+# vim: set filetype=python:
+# 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/.
+
diff --git a/view/Makefile.in b/view/Makefile.in
index 58d5fd55017..d7f86b8b9d3 100644
--- a/view/Makefile.in
+++ b/view/Makefile.in
@@ -11,7 +11,6 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= view
-DIRS		= public src
 
 include $(topsrcdir)/config/rules.mk
 
diff --git a/view/moz.build b/view/moz.build
new file mode 100644
index 00000000000..077f40f4f5a
--- /dev/null
+++ b/view/moz.build
@@ -0,0 +1,6 @@
+# vim: set filetype=python:
+# 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/.
+
+DIRS += ['public', 'src']
diff --git a/view/public/moz.build b/view/public/moz.build
new file mode 100644
index 00000000000..58ce5e27339
--- /dev/null
+++ b/view/public/moz.build
@@ -0,0 +1,5 @@
+# vim: set filetype=python:
+# 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/.
+
diff --git a/view/src/moz.build b/view/src/moz.build
new file mode 100644
index 00000000000..58ce5e27339
--- /dev/null
+++ b/view/src/moz.build
@@ -0,0 +1,5 @@
+# vim: set filetype=python:
+# 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/.
+