--- a/toolkit/crashreporter/test/CrashTestUtils.jsm
+++ b/toolkit/crashreporter/test/CrashTestUtils.jsm
@@ -25,16 +25,17 @@ this.CrashTestUtils = {
   MD_MEMORY_INFO_LIST_STREAM:  16
 };
 
 // Grab APIs from the testcrasher shared library
 Components.utils.import("resource://gre/modules/Services.jsm");
 Components.utils.import("resource://gre/modules/ctypes.jsm");
 var dir = Services.dirsvc.get("CurWorkD", Components.interfaces.nsILocalFile);
 var file = dir.clone();
+file.append('..')
 file.append(ctypes.libraryName("testcrasher"));
 var lib = ctypes.open(file.path);
 CrashTestUtils.crash = lib.declare("Crash",
                                    ctypes.default_abi,
                                    ctypes.void_t,
                                    ctypes.int16_t);
 CrashTestUtils.saveAppMemory = lib.declare("SaveAppMemory",
                                            ctypes.default_abi,

deleted file mode 100644
--- a/toolkit/crashreporter/test/Makefile.in
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# 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/.
-
-UNIT_FILES = $(SHARED_LIBRARY) CrashTestUtils.jsm
-UNIT_DEST = $(DEPTH)/_tests/xpcshell/$(relativesrcdir)/unit/
-INSTALL_TARGETS += UNIT
-
-UNIT_IPC_FILES = $(UNIT_FILES)
-UNIT_IPC_DEST = $(DEPTH)/_tests/xpcshell/$(relativesrcdir)/unit_ipc/
-INSTALL_TARGETS += UNIT_IPC

--- a/toolkit/crashreporter/test/moz.build
+++ b/toolkit/crashreporter/test/moz.build
@@ -1,14 +1,14 @@
 # -*- 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/.
-DIST_INSTALL = False
+FINAL_TARGET = '_tests/xpcshell/toolkit/crashreporter/test'
 
 XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini', 'unit_ipc/xpcshell.ini']
 BROWSER_CHROME_MANIFESTS += ['browser/browser.ini']
 
 UNIFIED_SOURCES += [
     '../google-breakpad/src/processor/basic_code_modules.cc',
     '../google-breakpad/src/processor/dump_context.cc',
     '../google-breakpad/src/processor/dump_object.cc',
@@ -23,11 +23,14 @@ UNIFIED_SOURCES += [
 GeckoSharedLibrary('testcrasher')
 
 DEFINES['SHARED_LIBRARY'] = '%s%s%s' % (
     CONFIG['DLL_PREFIX'],
     LIBRARY_NAME,
     CONFIG['DLL_SUFFIX']
 )
 
+TEST_HARNESS_FILES.xpcshell.toolkit.crashreporter.test.unit += ['CrashTestUtils.jsm']
+TEST_HARNESS_FILES.xpcshell.toolkit.crashreporter.test.unit_ipc += ['CrashTestUtils.jsm']
+
 include('/toolkit/crashreporter/crashreporter.mozbuild')
 
 NO_PGO = True