diff --git a/toolkit/library/dependentlibs.py b/toolkit/library/dependentlibs.py
index c52823e75f23..e17f6964b427 100644
--- a/toolkit/library/dependentlibs.py
+++ b/toolkit/library/dependentlibs.py
@@ -126,6 +126,12 @@ def gen_list(output, lib):
     deps = dependentlibs(lib, libpaths, func)
     deps[lib] = mozpath.join(libpaths[0], lib)
     output.write('\n'.join(deps.keys()) + '\n')
+
+    with open(output.name + ".gtest", 'w') as gtest_out:
+        libs = deps.keys()
+        libs[-1] = 'gtest/' + libs[-1]
+        gtest_out.write('\n'.join(libs) + '\n')
+
     return set(deps.values())
 
 def main():
diff --git a/toolkit/library/gtest/Makefile.in b/toolkit/library/gtest/Makefile.in
index f490b3f970bc..cde0734e8971 100644
--- a/toolkit/library/gtest/Makefile.in
+++ b/toolkit/library/gtest/Makefile.in
@@ -23,13 +23,6 @@ include $(topsrcdir)/config/config.mk
 # process from getting killed
 EXPAND_LIBS_EXEC := $(PYTHON) $(topsrcdir)/config/link.py
 
-ifdef COMPILE_ENVIRONMENT
-target:: $(DIST)/bin/dependentlibs.list.gtest
-endif
-
-$(DIST)/bin/dependentlibs.list.gtest: $(DIST)/bin/dependentlibs.list
-	sed -e 's|$(SHARED_LIBRARY)|gtest/$(SHARED_LIBRARY)|' $< > $@
-
 LINK_PDBFILE = xul-gtest.pdb
 
 endif
diff --git a/toolkit/library/moz.build b/toolkit/library/moz.build
index 30cc34cd6519..cd2ffb46f074 100644
--- a/toolkit/library/moz.build
+++ b/toolkit/library/moz.build
@@ -378,12 +378,13 @@ if CONFIG['COMPILE_ENVIRONMENT']:
             LIBRARY_NAME,
             CONFIG['DLL_SUFFIX']
         )
-    GENERATED_FILES += ['dependentlibs.list']
-    GENERATED_FILES['dependentlibs.list'].script = 'dependentlibs.py:gen_list'
-    GENERATED_FILES['dependentlibs.list'].inputs = [
+    GENERATED_FILES += [('dependentlibs.list', 'dependentlibs.list.gtest')]
+    dep_libs_list = GENERATED_FILES[('dependentlibs.list', 'dependentlibs.list.gtest')]
+    dep_libs_list.script = 'dependentlibs.py:gen_list'
+    dep_libs_list.inputs = [
         '!%s' % full_libname,
     ]
-    FINAL_TARGET_FILES += ['!dependentlibs.list']
+    FINAL_TARGET_FILES += ['!dependentlibs.list', '!dependentlibs.list.gtest']
 
 # WebRender dependencies
 if CONFIG['MOZ_ENABLE_WEBRENDER']: