diff --git a/toolkit/mozapps/update/tests/Makefile.in b/toolkit/mozapps/update/tests/Makefile.in
index b9310233d7c..bba7be0c67c 100644
--- a/toolkit/mozapps/update/tests/Makefile.in
+++ b/toolkit/mozapps/update/tests/Makefile.in
@@ -5,56 +5,39 @@
 XPCSHELLTESTROOT = $(abspath $(DEPTH))/_tests/xpcshell/$(relativesrcdir)
 CHROMETESTROOT = $(abspath $(DEPTH))/_tests/testing/mochitest/chrome/$(relativesrcdir)
 
-PP_TARGETS            += aus-update-head
-aus-update-head_FLAGS := -Fsubstitution $(DEFINES) $(ACDEFINES)
-aus-update-head       := $(srcdir)/unit_aus_update/head_update.js
-aus-update-head_PATH  := $(XPCSHELLTESTROOT)/unit_aus_update
-aus-update-head_TARGET := misc
+pp_const_file = $(srcdir)/data/xpcshellConstantsPP.js
 
-INSTALL_TARGETS       += xpcshell-data
-xpcshell-data_TARGET  := misc
-xpcshell-data_DEST    := $(XPCSHELLTESTROOT)/data
-xpcshell-data_FILES   := $(wildcard $(srcdir)/data/*)
+PP_TARGETS            += aus-test-const
+aus-test-const        := $(pp_const_file)
+aus-test-const_PATH   := $(XPCSHELLTESTROOT)/data
+aus-test-const_FLAGS  := -Fsubstitution $(DEFINES) $(ACDEFINES)
+aus-test-const_TARGET := misc
+
+INSTALL_TARGETS      += xpcshell-data
+xpcshell-data_FILES  := $(filter-out $(pp_const_file),$(wildcard $(srcdir)/data/*))
+xpcshell-data_DEST   := $(XPCSHELLTESTROOT)/data
+xpcshell-data_TARGET := misc
 
 # Android doesn't use the Mozilla updater or the toolkit update UI
 ifneq (android,$(MOZ_WIDGET_TOOLKIT))
-INSTALL_TARGETS           += base-updater-head
-base-updater-head_TARGET  := misc
-base-updater-head_DEST    := $(XPCSHELLTESTROOT)/unit_base_updater
-base-updater-head_FILES   := $(XPCSHELLTESTROOT)/unit_aus_update/head_update.js
-
-ifdef MOZ_MAINTENANCE_SERVICE
-INSTALL_TARGETS              += service-updater-head
-service-updater-head_TARGET  := misc
-service-updater-head_DEST    := $(XPCSHELLTESTROOT)/unit_service_updater
-service-updater-head_FILES   := $(XPCSHELLTESTROOT)/unit_aus_update/head_update.js
-endif # MOZ_MAINTENANCE_SERVICE
-
 ifndef MOZ_PROFILE_GENERATE
 ifdef COMPILE_ENVIRONMENT
-INSTALL_TARGETS              += xpcshell-test-helper
-xpcshell-test-helper_TARGET  := misc
-xpcshell-test-helper_DEST    := $(XPCSHELLTESTROOT)/data
-xpcshell-test-helper_FILES   := $(DIST)/bin/TestAUSHelper$(BIN_SUFFIX)
+INSTALL_TARGETS        += xpcshell-helper
+xpcshell-helper_FILES  := $(DIST)/bin/TestAUSHelper$(BIN_SUFFIX)
+xpcshell-helper_DEST   := $(XPCSHELLTESTROOT)/data
+xpcshell-helper_TARGET := misc
 endif
 endif # Not MOZ_PROFILE_GENERATE
 
-_CHROME_SHARED := \
-  update.sjs \
-  utils.js \
-  $(NULL)
-PP_TARGETS         += chrome-shared
-chrome-shared      := $(addprefix $(srcdir)/chrome/,$(_CHROME_SHARED))
-chrome-shared_PATH := $(CHROMETESTROOT)/chrome
-chrome-shared_TARGET := misc
-
 _CHROME_DATA := \
+  shared.js \
+  sharedUpdateXML.js \
   simple.mar \
   $(NULL)
-INSTALL_TARGETS     += chrome-data
-chrome-data_TARGET  := misc
-chrome-data_DEST    := $(CHROMETESTROOT)/data
-chrome-data_FILES   := $(addprefix $(srcdir)/data/,$(_CHROME_DATA))
+INSTALL_TARGETS    += chrome-data
+chrome-data_FILES  := $(addprefix $(srcdir)/data/,$(_CHROME_DATA))
+chrome-data_DEST   := $(CHROMETESTROOT)/data
+chrome-data_TARGET := misc
 
 INI_TEST_FILES = \
   TestAUSReadStrings1.ini \