diff --git a/ipc/ipdl/test/cxx/Makefile.in b/ipc/ipdl/test/cxx/Makefile.in
index b52adbd7b0bd..b6ca0bc92d50 100644
--- a/ipc/ipdl/test/cxx/Makefile.in
+++ b/ipc/ipdl/test/cxx/Makefile.in
@@ -2,49 +2,15 @@
 # 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/.
 
-IPDLTESTS = \
-  TestActorPunning \
-  TestBridgeMain \
-  TestCrashCleanup \
-  TestDataStructures \
-  TestDesc \
-  TestFailedCtor \
-  TestHangs \
-  TestJSON \
-  TestLatency \
-  TestManyChildAllocs  \
-  TestMultiMgrs  \
-  TestNestedLoops \
-  TestOpens \
-  TestInterruptErrorCleanup \
-  TestInterruptRaces \
-  TestInterruptShutdownRace \
-  TestRPC \
-  TestRaceDeferral \
-  TestRacyReentry  \
-  TestRacyInterruptReplies  \
-  TestRacyUndefer \
-  TestSanity  \
-  TestSelfManageRoot \
-  TestShmem \
-  TestShutdown \
-  TestStackHooks \
-  TestSyncError \
-  TestSyncHang \
-  TestSyncWakeup \
-  TestBadActor \
-  TestUrgency \
-  $(NULL)
+IPDLTESTSRCS = $(filter Test%,$(CPPSRCS))
+IPDLTESTS = $(IPDLTESTSRCS:.cpp=)
 
-ifeq ($(OS_ARCH),Linux)
-IPDLTESTS += TestSysVShmem
-endif
+CPPSRCS += IPDLUnitTests.cpp
 
 EXTRA_PROTOCOLS = \
   TestBridgeSub \
   $(NULL)
 
-IPDLTESTSRCS = $(addsuffix .cpp,$(IPDLTESTS))
 IPDLTESTHDRS = $(addprefix $(srcdir)/,$(addsuffix .h,$(IPDLTESTS)))
 
 TESTER_TEMPLATE := $(srcdir)/IPDLUnitTests.template.cpp
diff --git a/ipc/ipdl/test/cxx/PTestBridgeMain.ipdl b/ipc/ipdl/test/cxx/PTestBridgeMain.ipdl
index 0f576ae63984..93e905dd4dc2 100644
--- a/ipc/ipdl/test/cxx/PTestBridgeMain.ipdl
+++ b/ipc/ipdl/test/cxx/PTestBridgeMain.ipdl
@@ -1,3 +1,4 @@
+include protocol PTestBridgeMainSub;
 include protocol PTestBridgeSub;
 
 namespace mozilla {
diff --git a/ipc/ipdl/test/cxx/moz.build b/ipc/ipdl/test/cxx/moz.build
index 6c4d7eb301e8..7a7bd99e3ca3 100644
--- a/ipc/ipdl/test/cxx/moz.build
+++ b/ipc/ipdl/test/cxx/moz.build
@@ -17,9 +17,46 @@ EXPORTS.mozilla._ipdltest += [
 ]
 
 SOURCES += [
-    '$(IPDLTESTSRCS)',
+    'TestActorPunning.cpp',
+    'TestBadActor.cpp',
+    'TestBridgeMain.cpp',
+    'TestCrashCleanup.cpp',
+    'TestDataStructures.cpp',
+    'TestDesc.cpp',
+    'TestFailedCtor.cpp',
+    'TestHangs.cpp',
+    'TestInterruptErrorCleanup.cpp',
+    'TestInterruptRaces.cpp',
+    'TestInterruptShutdownRace.cpp',
+    'TestJSON.cpp',
+    'TestLatency.cpp',
+    'TestManyChildAllocs.cpp',
+    'TestMultiMgrs.cpp',
+    'TestNestedLoops.cpp',
+    'TestOpens.cpp',
+    'TestRaceDeferral.cpp',
+    'TestRacyInterruptReplies.cpp',
+    'TestRacyReentry.cpp',
+    'TestRacyUndefer.cpp',
+    'TestRPC.cpp',
+    'TestSanity.cpp',
+    'TestSelfManageRoot.cpp',
+    'TestShmem.cpp',
+    'TestShutdown.cpp',
+    'TestStackHooks.cpp',
+    'TestSyncError.cpp',
+    'TestSyncHang.cpp',
+    'TestSyncWakeup.cpp',
+    'TestUrgency.cpp',
+]
+
+if CONFIG['OS_ARCH'] == 'Linux':
+    SOURCES += [
+        'TestSysVShmem.cpp',
+    ]
+
+SOURCES += [
     'IPDLUnitTestProcessChild.cpp',
-    'IPDLUnitTests.cpp',
     'IPDLUnitTestSubprocess.cpp',
 ]