diff --git a/toolkit/content/tests/chrome/rtlchrome/Makefile.in b/toolkit/content/tests/chrome/rtlchrome/Makefile.in
index b484ffe0925d..67656bde5dfc 100644
--- a/toolkit/content/tests/chrome/rtlchrome/Makefile.in
+++ b/toolkit/content/tests/chrome/rtlchrome/Makefile.in
@@ -1,4 +1,3 @@
-#
 # 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/.
@@ -10,9 +9,11 @@ VPATH		= @srcdir@
 relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
-include $(topsrcdir)/config/rules.mk
 
-libs:: rtl.manifest rtl.css rtl.dtd
-	$(INSTALL) @srcdir@/rtl.manifest $(DEPTH)/_tests/testing/mochitest/chrome/$(relativesrcdir)/
-	$(INSTALL) @srcdir@/rtl.css $(DEPTH)/_tests/testing/mochitest/chrome/$(relativesrcdir)/
-	$(INSTALL) @srcdir@/rtl.dtd $(DEPTH)/_tests/testing/mochitest/chrome/$(relativesrcdir)/
+MOCHITEST_CHROME_FILES := \
+  rtl.css \
+  rtl.dtd \
+  rtl.manifest \
+  $(NULL)
+
+include $(topsrcdir)/config/rules.mk
diff --git a/toolkit/content/tests/chrome/rtltest/Makefile.in b/toolkit/content/tests/chrome/rtltest/Makefile.in
index c42c98ed1b6f..3c72d00b1716 100644
--- a/toolkit/content/tests/chrome/rtltest/Makefile.in
+++ b/toolkit/content/tests/chrome/rtltest/Makefile.in
@@ -1,4 +1,3 @@
-#
 # 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/.
@@ -10,8 +9,9 @@ VPATH		= @srcdir@
 relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
-include $(topsrcdir)/config/rules.mk
 
-libs:: righttoleft.manifest dirtest.xul
-	$(INSTALL) @srcdir@/righttoleft.manifest $(DEPTH)/_tests/testing/mochitest/chrome/$(relativesrcdir)/
-	$(INSTALL) @srcdir@/dirtest.xul $(DEPTH)/_tests/testing/mochitest/chrome/$(relativesrcdir)/content/
+MOCHITEST_CHROME_FILES := \
+  righttoleft.manifest \
+  $(NULL)
+
+include $(topsrcdir)/config/rules.mk
diff --git a/toolkit/content/tests/chrome/rtltest/content/Makefile.in b/toolkit/content/tests/chrome/rtltest/content/Makefile.in
new file mode 100644
index 000000000000..47bece880c4c
--- /dev/null
+++ b/toolkit/content/tests/chrome/rtltest/content/Makefile.in
@@ -0,0 +1,17 @@
+# 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/.
+
+DEPTH = @DEPTH@
+topsrcdir = @top_srcdir@
+srcdir = @srcdir@
+VPATH = @srcdir@
+relativesrcdir = @relativesrcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+MOCHITEST_CHROME_FILES := \
+  dirtest.xul \
+  $(NULL)
+
+include $(topsrcdir)/config/rules.mk
diff --git a/toolkit/content/tests/chrome/rtltest/dirtest.xul b/toolkit/content/tests/chrome/rtltest/content/dirtest.xul
similarity index 100%
rename from toolkit/content/tests/chrome/rtltest/dirtest.xul
rename to toolkit/content/tests/chrome/rtltest/content/dirtest.xul
diff --git a/toolkit/content/tests/chrome/rtltest/content/moz.build b/toolkit/content/tests/chrome/rtltest/content/moz.build
new file mode 100644
index 000000000000..895d11993cfb
--- /dev/null
+++ b/toolkit/content/tests/chrome/rtltest/content/moz.build
@@ -0,0 +1,6 @@
+# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
+# 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/toolkit/content/tests/chrome/rtltest/moz.build b/toolkit/content/tests/chrome/rtltest/moz.build
index 895d11993cfb..2540d3effe48 100644
--- a/toolkit/content/tests/chrome/rtltest/moz.build
+++ b/toolkit/content/tests/chrome/rtltest/moz.build
@@ -4,3 +4,6 @@
 # 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 += [
+    'content',
+]