--- a/automation/taskcluster/scripts/split.sh
+++ b/automation/taskcluster/scripts/split.sh
@@ -18,20 +18,25 @@ split_util() {
   #   nss/coreconf                full directory
   #   nss                         top files only
   #   nss/lib                     top files only
   #   nss/lib/util                full directory
 
   # Copy everything.
   cp -R $nssdir $dstdir
 
+  # Skip gtests when building.
+  sed '/^DIRS = /s/ gtests$//' $nssdir/manifest.mn > $dstdir/manifest.mn-t && mv $dstdir/manifest.mn-t $dstdir/manifest.mn
+
   # Remove subdirectories that we don't want.
   rm -rf $dstdir/cmd
+  rm -rf $dstdir/tests
   rm -rf $dstdir/lib
   rm -rf $dstdir/automation
+  rm -rf $dstdir/gtests
   rm -rf $dstdir/doc
 
   # Start with an empty cmd lib directories to be filled selectively.
   mkdir $dstdir/cmd
   cp $nssdir/cmd/Makefile $dstdir/cmd
   cp $nssdir/cmd/manifest.mn $dstdir/cmd
   cp $nssdir/cmd/platlibs.mk $dstdir/cmd
   cp $nssdir/cmd/platrules.mk $dstdir/cmd