deleted file mode 100644
--- a/modules/libbz2/src/Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
-# vim:set ts=8 sw=8 sts=8 noet:
-#
-# 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/.
-
-include $(topsrcdir)/config/rules.mk
-
-# The intermediate (.ii/.s) files for host and target can have the same name...
-# disable parallel builds
-.NOTPARALLEL:

deleted file mode 100644
--- a/modules/libmar/sign/Makefile.in
+++ /dev/null
@@ -1,10 +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/.
-
-# This makefile just builds support for reading archives.
-include $(topsrcdir)/config/rules.mk
-
-# The intermediate (.ii/.s) files for host and target can have the same name...
-# disable parallel builds
-.NOTPARALLEL:

deleted file mode 100644
--- a/modules/libmar/src/Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
-# vim:set ts=8 sw=8 sts=8 noet:
-#
-# 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/.
-
-# This makefile just builds support for reading archives.
-
-include $(topsrcdir)/config/rules.mk
-
-# The intermediate (.ii/.s) files for host and target can have the same name...
-# disable parallel builds
-.NOTPARALLEL:

deleted file mode 100644
--- a/modules/libmar/tests/Makefile.in
+++ /dev/null
@@ -1,21 +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/.
-
-TESTROOT = $(topobjdir)/_tests/xpcshell/$(relativesrcdir)
-
-include $(topsrcdir)/config/rules.mk
-
-ifneq ($(OS_TARGET),Android)
-ifndef MOZ_PROFILE_GENERATE
-libs::
-	$(INSTALL) ../tool/signmar$(BIN_SUFFIX) $(TESTROOT)/unit
-	$(INSTALL) $(DEPTH)/dist/bin/$(DLL_PREFIX)nss3$(DLL_SUFFIX) $(TESTROOT)/unit
-ifndef MOZ_FOLD_LIBS
-	$(INSTALL) $(DEPTH)/dist/bin/$(DLL_PREFIX)nssutil3$(DLL_SUFFIX) $(TESTROOT)/unit
-	$(INSTALL) $(DEPTH)/dist/bin/$(DLL_PREFIX)plc4$(DLL_SUFFIX) $(TESTROOT)/unit
-	$(INSTALL) $(DEPTH)/dist/bin/$(DLL_PREFIX)nspr4$(DLL_SUFFIX) $(TESTROOT)/unit
-	$(INSTALL) $(DEPTH)/dist/bin/$(DLL_PREFIX)plds4$(DLL_SUFFIX) $(TESTROOT)/unit
-endif
-endif
-endif # Not Android

--- a/modules/libmar/tests/moz.build
+++ b/modules/libmar/tests/moz.build
@@ -2,8 +2,28 @@
 # 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/.
 
 XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
 
 DEFINES['BIN_SUFFIX'] = CONFIG['BIN_SUFFIX']
+
+if CONFIG['OS_TARGET'] != 'Android':
+    nss_files = ['nss3']
+    if not CONFIG['MOZ_FOLD_LIBS']:
+        nss_files.extend([
+            'nssutil3',
+            'plc4',
+            'nspr4',
+            'plds4',
+        ])
+    TEST_HARNESS_FILES.xpcshell.modules.libmar.tests.unit += sorted(
+        ['!/dist/bin/%s%s%s' % (
+            CONFIG['DLL_PREFIX'],
+            name,
+            CONFIG['DLL_SUFFIX'],
+        ) for name in nss_files]
+    )
+    TEST_HARNESS_FILES.xpcshell.modules.libmar.tests.unit += [
+        '!../tool/signmar%s' % CONFIG['BIN_SUFFIX'],
+    ]

deleted file mode 100644
--- a/modules/libmar/verify/Makefile.in
+++ /dev/null
@@ -1,9 +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/.
-
-include $(topsrcdir)/config/rules.mk
-
-# The intermediate (.ii/.s) files for host and target can have the same name...
-# disable parallel builds
-.NOTPARALLEL: