diff --git a/js/src/xpconnect/tests/Makefile.in b/js/src/xpconnect/tests/Makefile.in
index aad3a11c011e..4eb7625f17df 100644
--- a/js/src/xpconnect/tests/Makefile.in
+++ b/js/src/xpconnect/tests/Makefile.in
@@ -44,7 +44,7 @@ relativesrcdir = js/src/xpconnect/tests
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS = idl mochitest chrome components
+DIRS = idl mochitest chrome components/native
 
 XPCSHELL_TESTS = unit
 
diff --git a/js/src/xpconnect/tests/components/Makefile.in b/js/src/xpconnect/tests/components/native/Makefile.in
similarity index 96%
rename from js/src/xpconnect/tests/components/Makefile.in
rename to js/src/xpconnect/tests/components/native/Makefile.in
index 747004fe220a..7fa29b9e885b 100644
--- a/js/src/xpconnect/tests/components/Makefile.in
+++ b/js/src/xpconnect/tests/components/native/Makefile.in
@@ -37,7 +37,7 @@
 #
 # ***** END LICENSE BLOCK *****
 
-DEPTH = ../../../../..
+DEPTH = ../../../../../..
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
@@ -71,7 +71,7 @@ include $(topsrcdir)/config/rules.mk
 
 DEFINES += -DLIBRARY_FILENAME="$(SHARED_LIBRARY)"
 
-componentdir = js/src/xpconnect/tests/components
+componentdir = js/src/xpconnect/tests/components/native
 
 libs:: $(SHARED_LIBRARY)
 	$(INSTALL) $^ $(testxpcobjdir)/$(componentdir)
diff --git a/js/src/xpconnect/tests/components/xpctest.manifest b/js/src/xpconnect/tests/components/native/xpctest.manifest
similarity index 100%
rename from js/src/xpconnect/tests/components/xpctest.manifest
rename to js/src/xpconnect/tests/components/native/xpctest.manifest
diff --git a/js/src/xpconnect/tests/components/xpctest_attributes.cpp b/js/src/xpconnect/tests/components/native/xpctest_attributes.cpp
similarity index 100%
rename from js/src/xpconnect/tests/components/xpctest_attributes.cpp
rename to js/src/xpconnect/tests/components/native/xpctest_attributes.cpp
diff --git a/js/src/xpconnect/tests/components/xpctest_module.cpp b/js/src/xpconnect/tests/components/native/xpctest_module.cpp
similarity index 94%
rename from js/src/xpconnect/tests/components/xpctest_module.cpp
rename to js/src/xpconnect/tests/components/native/xpctest_module.cpp
index b30ec5893887..b0d63b2e4048 100644
--- a/js/src/xpconnect/tests/components/xpctest_module.cpp
+++ b/js/src/xpconnect/tests/components/native/xpctest_module.cpp
@@ -67,8 +67,8 @@ static const mozilla::Module::CIDEntry kXPCTestCIDs[] = {
 };
 
 static const mozilla::Module::ContractIDEntry kXPCTestContracts[] = {
-    { "@mozilla.org/js/xpc/test/ObjectReadOnly;1", &kNS_XPCTESTOBJECTREADONLY_CID },
-    { "@mozilla.org/js/xpc/test/ObjectReadWrite;1", &kNS_XPCTESTOBJECTREADWRITE_CID },
+    { "@mozilla.org/js/xpc/test/native/ObjectReadOnly;1", &kNS_XPCTESTOBJECTREADONLY_CID },
+    { "@mozilla.org/js/xpc/test/native/ObjectReadWrite;1", &kNS_XPCTESTOBJECTREADWRITE_CID },
     { NULL }
 };
 
diff --git a/js/src/xpconnect/tests/components/xpctest_private.h b/js/src/xpconnect/tests/components/native/xpctest_private.h
similarity index 100%
rename from js/src/xpconnect/tests/components/xpctest_private.h
rename to js/src/xpconnect/tests/components/native/xpctest_private.h