diff --git a/startupcache/test/Makefile.in b/startupcache/test/Makefile.in
index 9e211fe34d5a3..9bd1b63783511 100644
--- a/startupcache/test/Makefile.in
+++ b/startupcache/test/Makefile.in
@@ -4,7 +4,3 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 LIBS += $(MOZ_COMPONENT_LIBS)
-DIST_FILES += \
-  $(srcdir)/TestStartupCacheTelemetry.manifest \
-  $(srcdir)/TestStartupCacheTelemetry.js \
-  $(NULL)
diff --git a/startupcache/test/moz.build b/startupcache/test/moz.build
index 391ee2de25bc8..96764428d5fab 100644
--- a/startupcache/test/moz.build
+++ b/startupcache/test/moz.build
@@ -8,3 +8,7 @@ CPP_UNIT_TESTS += [
     'TestStartupCache.cpp',
 ]
 
+EXTRA_COMPONENTS += [
+    'TestStartupCacheTelemetry.js',
+    'TestStartupCacheTelemetry.manifest',
+]
diff --git a/testing/testsuite-targets.mk b/testing/testsuite-targets.mk
index 03d562964bc83..b9fce34732779 100644
--- a/testing/testsuite-targets.mk
+++ b/testing/testsuite-targets.mk
@@ -503,8 +503,10 @@ endif
 ifeq ($(MOZ_WIDGET_TOOLKIT),android)
 	$(NSINSTALL) $(topsrcdir)/testing/android_cppunittest_manifest.txt $(PKG_STAGE)/cppunittests
 endif
+ifeq ($(MOZ_DISABLE_STARTUPCACHE),)
 	$(NSINSTALL) $(topsrcdir)/startupcache/test/TestStartupCacheTelemetry.js $(PKG_STAGE)/cppunittests
 	$(NSINSTALL) $(topsrcdir)/startupcache/test/TestStartupCacheTelemetry.manifest $(PKG_STAGE)/cppunittests
+endif
 ifdef STRIP_CPP_TESTS
 	$(OBJCOPY) $(or $(STRIP_FLAGS),--strip-unneeded) $(DIST)/bin/jsapi-tests$(BIN_SUFFIX) $(PKG_STAGE)/cppunittests/jsapi-tests$(BIN_SUFFIX)
 else