--- a/devtools/shared/heapsnapshot/moz.build
+++ b/devtools/shared/heapsnapshot/moz.build
@@ -5,17 +5,21 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 with Files('**'):
     BUG_COMPONENT = ('Firefox', 'Developer Tools: Memory')
 
 if CONFIG['ENABLE_TESTS']:
     DIRS += ['tests/gtest']
 
-XPCSHELL_TESTS_MANIFESTS += [ 'tests/unit/xpcshell.ini' ]
+XPCSHELL_TESTS_MANIFESTS += [
+    'tests/unit/xpcshell.ini',
+    'tests/unit/xpcshell_ipc.ini',
+]
+
 MOCHITEST_MANIFESTS += [ 'tests/mochitest/mochitest.ini' ]
 MOCHITEST_CHROME_MANIFESTS += [ 'tests/mochitest/chrome.ini' ]
 
 EXPORTS.mozilla.devtools += [
     'AutoMemMap.h',
     'CoreDump.pb.h',
     'DeserializedNode.h',
     'DominatorTree.h',

new file mode 100644
--- /dev/null
+++ b/devtools/shared/heapsnapshot/tests/unit/head_heapsnapshot_ipc.js
@@ -0,0 +1,10 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+"use strict";
+
+/* exported Cu, CC */
+
+// Simplistic head.js simply gathering dependencies needed for test_SaveHeapSnapshot.js
+var Cu = Components.utils;
+var CC = Components.Constructor;

--- a/devtools/shared/heapsnapshot/tests/unit/xpcshell.ini
+++ b/devtools/shared/heapsnapshot/tests/unit/xpcshell.ini
@@ -89,9 +89,8 @@ support-files =
 [test_HeapSnapshot_takeCensus_11.js]
 [test_HeapSnapshot_takeCensus_12.js]
 [test_ReadHeapSnapshot.js]
 [test_ReadHeapSnapshot_with_allocations.js]
 skip-if = os == 'linux' # Bug 1176173
 [test_ReadHeapSnapshot_worker.js]
 skip-if = os == 'linux' # Bug 1176173
 [test_SaveHeapSnapshot.js]
-[test_saveHeapSnapshot_e10s_01.js]

new file mode 100644
--- /dev/null
+++ b/devtools/shared/heapsnapshot/tests/unit/xpcshell_ipc.ini
@@ -0,0 +1,11 @@
+[DEFAULT]
+tags = devtools heapsnapshot devtools-memory
+head = head_heapsnapshot_ipc.js
+firefox-appdir = browser
+skip-if = toolkit == 'android'
+support-files =
+  test_SaveHeapSnapshot.js
+
+[test_saveHeapSnapshot_e10s_01.js]
+# Using a separate test suite for this test to avoid loading the shared xpcshell head.js
+# test file which will fail when trying to load preferences in content.