diff --git a/build/gen_test_packages_manifest.py b/build/gen_test_packages_manifest.py
index 3ad8a67378e8..d762e5835921 100644
--- a/build/gen_test_packages_manifest.py
+++ b/build/gen_test_packages_manifest.py
@@ -19,7 +19,6 @@ ALL_HARNESSES = [
     'mozbase',
     'web-platform',
     'talos',
-    'gtest',
 ]
 
 PACKAGE_SPECIFIED_HARNESSES = [
@@ -31,11 +30,6 @@ PACKAGE_SPECIFIED_HARNESSES = [
     'talos',
 ]
 
-# These packages are not present for every build configuration.
-OPTIONAL_PACKAGES = [
-    'gtest',
-]
-
 
 def parse_args():
     parser = ArgumentParser(description='Generate a test_packages.json file to tell automation which harnesses require which test packages.')
@@ -52,10 +46,6 @@ def parse_args():
         parser.add_argument("--%s" % harness, required=True,
                             action="store", dest=harness,
                             help="Name of the %s zip." % harness)
-    for harness in OPTIONAL_PACKAGES:
-        parser.add_argument("--%s" % harness, required=False,
-                            action="store", dest=harness,
-                            help="Name of the %s zip." % harness)
     parser.add_argument("--dest-file", required=True,
                         action="store", dest="destfile",
                         help="Path to the output file to be written.")
@@ -76,10 +66,8 @@ def generate_package_data(args):
 
     harness_requirements = dict([(k, [tests_common]) for k in ALL_HARNESSES])
     harness_requirements['jittest'].append(jsshell)
-    for harness in PACKAGE_SPECIFIED_HARNESSES + OPTIONAL_PACKAGES:
-        pkg_name = getattr(args, harness, None)
-        if pkg_name is None:
-            continue
+    for harness in PACKAGE_SPECIFIED_HARNESSES:
+        pkg_name = getattr(args, harness)
         if args.use_short_names:
             pkg_name = 'target.%s.tests.zip' % harness
         harness_requirements[harness].append(pkg_name)
diff --git a/testing/gtest/Makefile.in b/testing/gtest/Makefile.in
index d2978b5b9050..7f60a165d32e 100644
--- a/testing/gtest/Makefile.in
+++ b/testing/gtest/Makefile.in
@@ -7,6 +7,12 @@
 
 include $(topsrcdir)/config/rules.mk
 
+# Bug 1028035: Linking xul-gtest.dll takes too long, so we disable GTest on
+# Windows PGO builds.
+ifeq (1_WINNT,$(MOZ_PGO)_$(OS_ARCH))
+SKIP_GTEST_DURING_MAKE_CHECK ?= 1
+endif
+
 ifeq (browser,$(MOZ_BUILD_APP))
 ifdef COMPILE_ENVIRONMENT
 gtest::
@@ -14,5 +20,26 @@ gtest::
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 	$(MAKE) -C $(DEPTH)/browser/app repackage
 endif
+ifneq (1,$(SKIP_GTEST_DURING_MAKE_CHECK))
+check::
+	$(MAKE) -C $(DEPTH)/toolkit/library gtestxul
+ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
+	$(MAKE) -C $(DEPTH)/browser/app repackage
+	$(PYTHON) $(topsrcdir)/testing/gtest/rungtests.py \
+		--cwd=$(DEPTH)/_tests/gtest \
+		--xre-path=$(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/Resources \
+		--symbols-path=$(DIST)/crashreporter-symbols \
+		$(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/MacOS/$(MOZ_APP_NAME)$(BIN_SUFFIX)
+else
+	$(PYTHON) $(topsrcdir)/testing/gtest/rungtests.py \
+		--cwd=$(DEPTH)/_tests/gtest \
+		--xre-path=$(DIST)/bin \
+		--symbols-path=$(DIST)/crashreporter-symbols \
+		$(DIST)/bin/$(MOZ_APP_NAME)$(BIN_SUFFIX)
+endif
+else
+check::
+	echo GTest skipped during make check
+endif
 endif
 endif
diff --git a/testing/testsuite-targets.mk b/testing/testsuite-targets.mk
index a17b7204f783..c7f2adf0a075 100644
--- a/testing/testsuite-targets.mk
+++ b/testing/testsuite-targets.mk
@@ -24,20 +24,6 @@ ifndef TEST_PACKAGE_NAME
 TEST_PACKAGE_NAME := $(ANDROID_PACKAGE_NAME)
 endif
 
-# Linking xul-gtest.dll takes too long, so we disable GTest on
-# Windows PGO builds (bug 1028035).
-ifneq (1_WINNT,$(MOZ_PGO)_$(OS_ARCH))
-BUILD_GTEST=1
-endif
-
-ifdef MOZ_B2G
-BUILD_GTEST=
-endif
-
-ifeq ($(MOZ_BUILD_APP),mobile/android)
-BUILD_GTEST=
-endif
-
 RUN_MOCHITEST_B2G_DESKTOP = \
   rm -f ./$@.log && \
   $(PYTHON) _tests/testing/mochitest/runtestsb2g.py \
@@ -401,10 +387,6 @@ ifdef MOZ_WEBRTC
 stage-all: stage-steeplechase
 endif
 
-ifdef BUILD_GTEST
-stage-all: stage-gtest
-endif
-
 TEST_PKGS := \
   common \
   cppunittest \
@@ -498,15 +480,6 @@ stage-xpcshell: make-stage-dir
 stage-jstests: make-stage-dir
 	$(MAKE) -C $(DEPTH)/js/src/tests stage-package
 
-stage-gtest: make-stage-dir
-# FIXME: (bug 1200311) We should be generating the gtest xul as part of the build.
-	$(MAKE) -C $(DEPTH)/testing/gtest gtest
-	$(NSINSTALL) -D $(PKG_STAGE)/gtest/gtest_bin
-	cp -RL $(DIST)/bin/gtest $(PKG_STAGE)/gtest/gtest_bin
-	cp -RL $(DEPTH)/_tests/gtest $(PKG_STAGE)
-	cp $(topsrcdir)/testing/gtest/rungtests.py $(PKG_STAGE)/gtest
-	cp $(DIST)/bin/dependentlibs.list.gtest $(PKG_STAGE)/gtest
-
 stage-android: make-stage-dir
 ifdef MOZ_ENABLE_SZIP
 # Tinderbox scripts are not unzipping everything, so the file needs to be in a directory it unzips
diff --git a/toolkit/mozapps/installer/package-name.mk b/toolkit/mozapps/installer/package-name.mk
index d3f4b194bfe3..5c5f486d94ce 100644
--- a/toolkit/mozapps/installer/package-name.mk
+++ b/toolkit/mozapps/installer/package-name.mk
@@ -143,7 +143,6 @@ MOCHITEST_PACKAGE = $(PKG_BASENAME).mochitest.tests.zip
 REFTEST_PACKAGE = $(PKG_BASENAME).reftest.tests.zip
 WP_TEST_PACKAGE = $(PKG_BASENAME).web-platform.tests.zip
 TALOS_PACKAGE = $(PKG_BASENAME).talos.tests.zip
-GTEST_PACKAGE = $(PKG_BASENAME).gtest.tests.zip
 
 ifneq (,$(wildcard $(DIST)/bin/application.ini))
 BUILDID = $(shell $(PYTHON) $(MOZILLA_DIR)/config/printconfigsetting.py $(DIST)/bin/application.ini App BuildID)
diff --git a/toolkit/mozapps/installer/upload-files.mk b/toolkit/mozapps/installer/upload-files.mk
index 5bfaa3899bf8..9a08171a3b82 100644
--- a/toolkit/mozapps/installer/upload-files.mk
+++ b/toolkit/mozapps/installer/upload-files.mk
@@ -739,7 +739,6 @@ UPLOAD_FILES= \
   $(call QUOTED_WILDCARD,$(DIST)/$(PKG_PATH)$(TALOS_PACKAGE)) \
   $(call QUOTED_WILDCARD,$(DIST)/$(PKG_PATH)$(REFTEST_PACKAGE)) \
   $(call QUOTED_WILDCARD,$(DIST)/$(PKG_PATH)$(WP_TEST_PACKAGE)) \
-  $(call QUOTED_WILDCARD,$(DIST)/$(PKG_PATH)$(GTEST_PACKAGE)) \
   $(call QUOTED_WILDCARD,$(DIST)/$(PKG_PATH)$(SYMBOL_ARCHIVE_BASENAME).zip) \
   $(call QUOTED_WILDCARD,$(DIST)/$(SDK)) \
   $(call QUOTED_WILDCARD,$(MOZ_SOURCESTAMP_FILE)) \